修改1

cms/src/main/java/com/zxhl/cms/common/NetConfig.java

@@ -21,7 +21,7 @@ public class NetConfig {
     }
 
     // 根据调试选项更新环境
-    public static Environment sEnvironment = DEV;// 当前环境
+    public static Environment sEnvironment = PRODUCT;// 当前环境
     public static String BASE_WEB_URL = "";
     public static String BASE_URL = "";
     public static String BASE_NEW_URL = "";
@@ -280,6 +280,7 @@ public class NetConfig {
         public static final String HOME_FLASH_SALE_SKILL = "app/v1/game/xiaoxiang/skill";//秒杀时间表
         public static final String HOME_FLASH_SALE_BEGIN_SKILL = "app/v1/game/xiaoxiang/skill";//开始秒杀
         public static final String HOME_FLASH_SALE_SKILL_LIST = "app/v1/game/xiaoxiang/skill/list";//秒杀商品列表
+        public static final String HOME_FLASH_SALE_UPDATE_ORDER_ADDRESS= "app/v1/game/xiaoxiang/update/order/addr";//关联秒杀订单地址(商品秒杀专用)
     }
 
 

cms/src/main/java/com/zxhl/cms/net/api/IHomeApi.kt

@@ -388,4 +388,8 @@ interface IHomeApi {
         @Query("durationId") durationId: String?,
         @Query("id") id: String?
     ): Observable<Response<ToSkillInfoEntity>>
+
+    //关联地址
+    @POST(NetConfig.FlashSale.HOME_FLASH_SALE_UPDATE_ORDER_ADDRESS)
+    fun updateAddress(@Query("addressId") addressId: String?,@Query("outTradeNo") outTradeNo: String?): Observable<Response<Any>>
 }
\ No newline at end of file

cms/src/main/java/com/zxhl/cms/net/api/IUserInfoApi.java

@@ -160,6 +160,6 @@ public interface IUserInfoApi {
      * @return
      */
     @POST(NetConfig.User.URL_PAY_RIGHTS_ORDER)
-    Observable<Response<AliPayEntity>> aliPayRights(@Query("goodsId") String goodsId, @Query("payType") String payType, @Query("phone") String phone,@Query("rechargeType") String rechargeType);
+    Observable<Response<AliPayEntity>> aliPayRights(@Query("goodsId") String goodsId, @Query("payType") String payType, @Query("phone") String phone,@Query("rechargeType") String rechargeType,@Query("skill") Boolean skill,@Query("outTradeNo") String outTradeNo);
 
 }

cms/src/main/java/com/zxhl/cms/net/model/box/GoodList.kt

 package com.zxhl.cms.net.model.box
 
-class GoodList {
+import java.io.Serializable
+
+class GoodList : Serializable {
     var id: String? = ""
     var productId: String? = ""
     var boxId: String? = ""
@@ -9,6 +11,7 @@ class GoodList {
     var descImg: String? = ""
     var salePrice: String? = ""
     var salePriceStr: String? = ""
+    var skillPrice: String? = ""
     var originalPriceDb: String? = ""
     var cateName: String? = ""
     var goodsLevel: String? = ""

moduleMain/src/main/AndroidManifest.xml

@@ -299,6 +299,17 @@
                     android:scheme="xxsq" />
             </intent-filter>
         </activity>
+        <activity android:name=".activity.SkillShopActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data
+                    android:host="skillshop"
+                    android:scheme="xxsq" />
+            </intent-filter>
+        </activity>
     </application>
 
 

moduleMain/src/main/java/com/zxbw/modulemain/activity/CardDetailActivity.kt

@@ -41,6 +41,8 @@ class CardDetailActivity : BaseActivity(), CardDetailContract.View {
     private var payResultObservable: Observable<PayResultEntity>? = null
     var goodsID: String? = ""
     var type: String? = "0"
+    var skill:Boolean?=false
+    var outTradeNo:String?=""
     override fun onClick(v: View?) {
 
     }
@@ -58,6 +60,9 @@ class CardDetailActivity : BaseActivity(), CardDetailContract.View {
         val cardbean: RightsDetailEntity =
             intent.getSerializableExtra("cardbean") as RightsDetailEntity
         type= intent.getStringExtra("type")
+        outTradeNo= intent.getStringExtra("outTradeNo")
+        skill= intent.getBooleanExtra("skill",false)
+        Log.e("MXL","skill"+skill)
         initPay()
         goodsID = cardbean.id
         id_img_back?.setOnClickListener {
@@ -84,7 +89,7 @@ class CardDetailActivity : BaseActivity(), CardDetailContract.View {
         id_tv_card_price?.text = "${bean.salePrice}"
         id_tv_guanfang_price?.text = "官方价 ¥${bean.originPrice}元"
         id_tv_guanfang_price?.getPaint()?.setFlags(Paint.STRIKE_THRU_TEXT_FLAG) //中划线
-        id_tv_pay_price?.text = "${bean.salePrice}"
+        id_tv_pay_price?.text = "${bean.skillPrice}"
         id_tv_jiesheng_price?.text = "立省${bean.costPrice}元"
     }
 
@@ -150,7 +155,7 @@ class CardDetailActivity : BaseActivity(), CardDetailContract.View {
         isClickPayBtn = true
         mLoading?.setLoading("请稍后...")
         mLoading?.show()
-        mPayPresenter?.requestRightsAliPay(goodsID.toString(), pay_type.toString(), "","51")
+        mPayPresenter?.requestRightsAliPay(goodsID.toString(), pay_type.toString(), "","51",skill,outTradeNo)
     }
 
     override fun requestOrderSuc(result: AliPayEntity) {

moduleMain/src/main/java/com/zxbw/modulemain/activity/FlashSaleActivity.kt

@@ -30,6 +30,7 @@ class FlashSaleActivity : BaseActivity(), FlashSaleContract.View,
     private var durationId: String? = ""
     private var skillGoodsEntity: SkillGoodsEntity? = null
     var mChoosList: MutableList<String> = ArrayList()
+    var outTradeNo:String?=""
     override fun onClick(v: View?) {
 
     }
@@ -119,29 +120,37 @@ class FlashSaleActivity : BaseActivity(), FlashSaleContract.View,
         }
 
         if (boolean) {
+            outTradeNo=result?.outTradeNo
             val user = SettingPreference.getUserInfoData()
             if (user.member) {
                 if (TextUtils.equals(skillGoodsEntity?.goodsType, "50")) {
                     val intent = Intent(this, ToPaySkillGoodsActivity::class.java)
                     intent.putExtra("skillgoods", skillGoodsEntity)
                     intent.putExtra("type", "1")
+                    intent.putExtra("skill",true)
+                    intent.putExtra("outTradeNo",outTradeNo)
                     startActivity(intent)
                 } else if (TextUtils.equals(skillGoodsEntity?.goodsType, "51")) {
                     //卡券商品
                     val intent = Intent(mActivity, CardDetailActivity::class.java)
                     intent.putExtra("cardbean", skillGoodsEntity?.card)
                     intent.putExtra("type", "1")
+                    intent.putExtra("skill",true)
+                    intent.putExtra("outTradeNo",outTradeNo)
                     startActivity(intent)
                 } else if (TextUtils.equals(skillGoodsEntity?.goodsType, "99")) {
-                    //实物商品
-                    mChoosList.clear()
-                    mChoosList.add(skillGoodsEntity?.goods?.id.toString())
-                    val intent = Intent(mActivity, ShopOrderActivity::class.java)
+//                    //实物商品
+//                    mChoosList.clear()
+//                    mChoosList.add(skillGoodsEntity?.goods?.id.toString())
+                    val intent = Intent(mActivity, SkillShopActivity::class.java)
+                    intent.putExtra("goodsbean", skillGoodsEntity?.goods)
                     intent.putExtra("type", "1")
-                    intent.putStringArrayListExtra(
-                        "stringList",
-                        mChoosList as java.util.ArrayList<String>?
-                    )
+                    intent.putExtra("skill",true)
+                    intent.putExtra("outTradeNo",outTradeNo)
+//                    intent.putStringArrayListExtra(
+//                        "stringList",
+//                        mChoosList as java.util.ArrayList<String>?
+//                    )
                     startActivity(intent)
                 }
 

moduleMain/src/main/java/com/zxbw/modulemain/activity/RightsDetailActivity.kt

@@ -50,7 +50,7 @@ class RightsDetailActivity : BaseActivity(), RightsDetailContract.View, RightsPa
     private var brandName: String = "";
     private var mRightsData: RightsDetailEntity? = null
     private var mLoading: LoadingDialog? = null
-
+    var skill:Boolean?=false
     override fun layoutID(): Int {
         return R.layout.activity_layout_rights_detail
     }

moduleMain/src/main/java/com/zxbw/modulemain/activity/SettingActivity.kt

@@ -33,6 +33,7 @@ class SettingActivity : BaseActivity() {
         }
         id_tv_user_number?.text = user.nickname
         id_tv_number?.text=user.phone
+        id_tv_id?.text=user.uid
         id_tv_version_code?.text = "V${Constant.Param.vn}"
         if (!TextUtils.isEmpty(user.headImage)) {
             Glide.with(this).load(user.headImage)

moduleMain/src/main/java/com/zxbw/modulemain/activity/ToPaySkillGoodsActivity.kt

@@ -43,6 +43,8 @@ class ToPaySkillGoodsActivity : BaseActivity(), CardDetailContract.View {
     private var payResultObservable: Observable<PayResultEntity>? = null
     var goodsID: String? = ""
     var type: String? = "0"
+    var skill:Boolean?=false
+    var outTradeNo:String?=""
     override fun onClick(v: View?) {
 
     }
@@ -60,6 +62,8 @@ class ToPaySkillGoodsActivity : BaseActivity(), CardDetailContract.View {
         val skillGoodsEntity: SkillGoodsEntity =
             intent.getSerializableExtra("skillgoods") as SkillGoodsEntity
         type = intent.getStringExtra("type")
+        outTradeNo = intent.getStringExtra("outTradeNo")
+        skill= intent.getBooleanExtra("skill",false)
         initPay()
         goodsID = skillGoodsEntity.goodsId
         setDataView(skillGoodsEntity)
@@ -155,7 +159,7 @@ class ToPaySkillGoodsActivity : BaseActivity(), CardDetailContract.View {
         isClickPayBtn = true
         mLoading?.setLoading("请稍后...")
         mLoading?.show()
-        mPayPresenter?.requestRightsAliPay(goodsID.toString(), pay_type.toString(), "","50")
+        mPayPresenter?.requestRightsAliPay(goodsID.toString(), pay_type.toString(), "","50",skill,outTradeNo)
     }
 
     override fun requestOrderSuc(result: AliPayEntity) {

moduleMain/src/main/java/com/zxbw/modulemain/adapter/FlashSaleAdapter.kt

@@ -71,7 +71,7 @@ class FlashSaleAdapter : BaseRecyclerAdapter<SkillGoodsEntity, FlashSaleAdapter.
         } else {
             holder.id_img_member_bg?.setLoadImageUrl(bean.goods?.mainImage, false)
             holder.id_tv_name?.text = "${bean.goods?.productName}"
-            holder.id_tv_sale_price?.text = "${bean.goods?.salePriceStr}"
+            holder.id_tv_sale_price?.text = "${bean.skillPrice}"
             holder.id_tv_yuanjia?.text = "${bean.goods?.originalPriceDb}"
         }
         holder.id_tv_yuanjia?.getPaint()?.setFlags(Paint.STRIKE_THRU_TEXT_FLAG) //中划线

moduleMain/src/main/java/com/zxbw/modulemain/contract/CardDetailContract.kt

@@ -15,7 +15,7 @@ class CardDetailContract {
     }
 
     interface Presenter {
-        fun requestRightsAliPay(goodsId: String, payType: String, phone: String,type:String)
+        fun requestRightsAliPay(goodsId: String, payType: String, phone: String,type:String,skill:Boolean?,outTradeNo:String?)
 
         fun verifyPay(order: String?, payType: Int)
     }

moduleMain/src/main/java/com/zxbw/modulemain/fragment/UserCenterFragment.kt

 package com.zxbw.modulemain.fragment
 
 import android.text.TextUtils
+import android.util.Log
 import android.view.View
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CircleCrop
@@ -76,6 +77,18 @@ class UserCenterFragment : BaseFragment(), AdCallback<String> {
             UserDataUtils.updateUserInfo(this)
         }
     }
+    private var isPause = false
+    override fun onPause() {
+        super.onPause()
+        isPause = true
+
+    }
+    override fun onResume() {
+        super.onResume()
+        if (isPause) {
+            UserDataUtils.updateUserInfo(this)
+        }
+    }
 
     override fun onResult(code: Int, result: String?) {
         updateView()

moduleMain/src/main/java/com/zxbw/modulemain/presenter/CardDetailPresenter.kt

@@ -21,8 +21,8 @@ class CardDetailPresenter : CardDetailContract.Presenter {
     }
 
 
-    override fun requestRightsAliPay(goodsId: String, payType: String, phone: String,type:String) {
-        ApiClient.userInfoAPi.aliPayRights(goodsId, payType, phone,type)
+    override fun requestRightsAliPay(goodsId: String, payType: String, phone: String,type:String,skill:Boolean?,outTradeNo:String?) {
+        ApiClient.userInfoAPi.aliPayRights(goodsId, payType, phone,type,skill,outTradeNo)
             .compose(RxSchedulers.observableIO2Main())
             .subscribe(object : BaseObserver<AliPayEntity>() {
                 override fun onSuccess(result: AliPayEntity?) {

moduleMain/src/main/java/com/zxbw/modulemain/presenter/RightsPayPresenter.kt

@@ -38,7 +38,7 @@ class RightsPayPresenter : RightsPayContract.Presenter {
 
 
     override fun requestRightsAliPay(goodsId: String, payType: String, phone: String) {
-        ApiClient.userInfoAPi.aliPayRights(goodsId, payType, phone, "50")
+        ApiClient.userInfoAPi.aliPayRights(goodsId, payType, phone, "50",false,"")
             .compose(RxSchedulers.observableIO2Main())
             .subscribe(object : BaseObserver<AliPayEntity>() {
                 override fun onSuccess(result: AliPayEntity?) {

moduleMain/src/main/res/layout/activity_layout_setting.xml

@@ -78,6 +78,33 @@
             android:background="@color/white"
             android:orientation="vertical">
 
+            <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:textColor="@color/color_333333"
+                android:textSize="16sp"
+                android:text="手机号码" />
+
+            <TextView
+                android:id="@+id/id_tv_number"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:textColor="@color/color_999999"
+                android:textSize="14sp" />
+        </RelativeLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#EBEBEB" />
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
@@ -90,17 +117,17 @@
                     android:layout_centerVertical="true"
                     android:textColor="@color/color_333333"
                     android:textSize="16sp"
-                    android:text="手机号码" />
+                    android:text="用户ID" />
 
                 <TextView
-                    android:id="@+id/id_tv_number"
+                    android:id="@+id/id_tv_id"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:textColor="@color/color_999999"
                     android:textSize="14sp"
-                    android:text="123455" />
+                    android:text="" />
             </RelativeLayout>
             <View
                 android:layout_width="match_parent"

moduleMain/src/main/res/layout/dialog_layout_exit_skill_buy.xml

@@ -14,9 +14,20 @@
             android:layout_height="wrap_content"
             android:src="@drawable/bg_dialog_exit_buy" />
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/id_ll_bottom"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="20dp"
+            android:text="退出将放弃抢购名额"
+            android:textColor="@color/color_333333"
+            android:visibility="gone"/>
+
         <LinearLayout
-            android:layout_width="240dp"
-            android:layout_height="68dp"
+            android:id="@+id/id_ll_bottom"
+            android:layout_width="262dp"
+            android:layout_height="80dp"
             android:layout_alignBottom="@+id/id_img_bg"
             android:gravity="center">
 

moduleMain/src/main/res/layout/dialog_layout_loot_all.xml

@@ -12,26 +12,30 @@
         android:gravity="center_horizontal">
 
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="116dp"
-            android:text="很遗憾"
-            android:textColor="@color/color_333333"
-            android:textSize="20sp" />
+<!--        <TextView-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_marginTop="116dp"-->
+<!--            android:text="很遗憾"-->
+<!--            android:textColor="@color/color_333333"-->
+<!--            android:textSize="20sp" />-->
 
+<!--        <TextView-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:text="被抢光了，下次再来吧～"-->
+<!--            android:layout_marginTop="15dp"-->
+<!--            android:textColor="@color/color_666666"-->
+<!--            android:textSize="16sp" />-->
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="被抢光了，下次再来吧～"
-            android:layout_marginTop="15dp"
-            android:textColor="@color/color_666666"
-            android:textSize="16sp" />
+            android:layout_weight="1"/>
         <ImageView
             android:id="@+id/id_img_i_know"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="30dp"
+            android:layout_marginBottom="18dp"
             android:src="@drawable/button_wozhidaol"/>
     </LinearLayout>
 </LinearLayout>

moduleMain/src/main/res/layout/item_layout_more_discount.xml

@@ -23,15 +23,14 @@
 
         <TextView
             android:id="@+id/id_tv_name"
-            android:layout_width="90dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/id_img_member_bg"
-            android:layout_centerHorizontal="true"
             android:layout_marginLeft="4dp"
+            android:layout_marginRight="4dp"
             android:layout_marginTop="20dp"
             android:lines="1"
             android:ellipsize="end"
-            android:text="优酷会员黄…"
             android:textColor="@color/color_333333"
             android:textSize="12sp" />
 

moduleMain/src/main/res/layout/item_layout_sale_flash_top.xml

@@ -24,11 +24,11 @@
 
         <TextView
             android:id="@+id/id_tv_name"
-            android:layout_width="90dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/id_img_member_bg"
-            android:layout_centerHorizontal="true"
             android:layout_marginLeft="4dp"
+            android:layout_marginRight="4dp"
             android:layout_marginTop="20dp"
             android:ellipsize="end"
             android:lines="1"