确认订单UI完善

CommonLib/BCommon/src/main/java/com/yidian/bcommon/constant/XEventConfig.kt

@@ -22,5 +22,9 @@ class XEventConfig {
     const val CHOOSE_STORE_SUCCESS = "choose_store_success"
     // 商品发布成功
     const val COMMODITY_PUBLISH_SUCCESS = "commodity_publish_success"
+    // 确认订单选择自提点成功
+    const val CONFIRM_ORDER_CHOOSE_POINT_SUCCESS = "confirm_order_choose_point_success"
+    // 确认订单选择优惠券成功
+    const val CONFIRM_ORDER_CHOOSE_COUPON_SUCCESS = "confirm_order_choose_coupon_success"
   }
 }

Components/BDemo/src/main/java/com/yidian/shenghuoquan/bdemo/dto/ConfirmOrderRequest.kt

+package com.yidian.shenghuoquan.bdemo.dto
+
+import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
+
+/**
+ * 确认订单请求参数
+ */
+@Parcelize
+data class ConfirmOrderRequest(
+  @SerializedName("business_from")
+  val businessFrom: Int? = null,
+  @SerializedName("goods_list")
+  val goodsList: List<Goods>? = null,
+  @SerializedName("marketing_id")
+  val marketingId: String? = null
+) : Parcelable
+
+@Parcelize
+data class Goods(
+  @SerializedName("goods_sku_id")
+  val goodsSkuId: String? = null,
+  @SerializedName("goods_sku_num")
+  val goodsSkuNum: Int? = null
+) : Parcelable

Components/BDemo/src/main/java/com/yidian/shenghuoquan/bdemo/ui/DemoTestActivity.kt

@@ -5,6 +5,8 @@ import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.extensions.clickAntiShake
 import com.yidian.shenghuoquan.bdemo.databinding.ActivityDemoTestBinding
+import com.yidian.shenghuoquan.bdemo.dto.ConfirmOrderRequest
+import com.yidian.shenghuoquan.bdemo.dto.Goods
 import com.yidian.xpage.XPageManager
 
 
@@ -27,10 +29,15 @@ class DemoTestActivity : BaseActivity<ActivityDemoTestBinding>() {
   }
 
   private fun initClick() {
+    val list = mutableListOf<Goods>()
+    list.add(Goods(goodsSkuId = "04qbwzoazPixJUhfOppD", goodsSkuNum = 1))
+    val confirmOrderReqDto = ConfirmOrderRequest(businessFrom = 2, goodsList = list, marketingId = "79")
     // 模拟h5进入确认订单的参数和逻辑
     viewBind.btnOrderConfirm.clickAntiShake {
       val hashMap = HashMap<String, Any?>()
-      hashMap["marketing_id"] = 121231321// 活动id
+      hashMap["business_from"] = "2"
+      hashMap["marketing_id"] = "1"// 活动id
+      hashMap["goods_list"] = list
       XPageManager.push(XRouterPathConstants.CONFIRM_ORDER_ACTIVITY, hashMap)
     }
   }

Components/BOrder/src/main/AndroidManifest.xml

@@ -4,7 +4,9 @@
     package="com.yidian.shenghuoquan.border">
 
     <application>
-        <activity android:name="com.yidian.shenghuoquan.border.ui.ConfirmOrderActivity"/>
+        <activity
+            android:name="com.yidian.shenghuoquan.border.ui.ConfirmOrderActivity"
+            android:windowSoftInputMode="adjustPan" />
         <activity android:name="com.yidian.shenghuoquan.border.ui.OrderDetailActivity" />
     </application>
 

Components/BOrder/src/main/java/com/yidian/shenghuoquan/border/adapter/OrderConfirmCommodityListAdapter.kt

+package com.yidian.shenghuoquan.border.adapter
+
+import android.annotation.SuppressLint
+import android.widget.ImageView
+import android.widget.TextView
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.viewholder.BaseViewHolder
+import com.yidian.shenghuoquan.border.R
+import com.yidian.shenghuoquan.border.dto.GoodsList
+
+/**
+ * 确认订单页面商品列表适配器
+ */
+class OrderConfirmCommodityListAdapter : BaseQuickAdapter<GoodsList, BaseViewHolder>(R.layout.border_item_order_confirm_commodity_list) {
+
+  @SuppressLint("SetTextI18n")
+  override fun convert(holder: BaseViewHolder, item: GoodsList) {
+    holder.getView<TextView>(R.id.tv_commodity_name).text = item.name
+    holder.getView<TextView>(R.id.tv_commodity_count).text = "共" + item.name + "件"
+    holder.getView<TextView>(R.id.tv_commodity_amount).text = "¥" + item.name
+    val ivCommodityPic = holder.getView<ImageView>(R.id.iv_commodity_pic)
+//    Glide.with(context).load(item.url)
+//      .apply(
+//        RequestOptions()
+//          .transform(CenterCrop(), RoundedCorners(DensityUtil.dp2px(12F)))
+//          .error(R.drawable.img_order_commodity_placeholder)
+//          .placeholder(R.drawable.img_order_commodity_placeholder)
+//      )
+//      .into(ivCommodityPic)
+  }
+
+}

Components/BOrder/src/main/java/com/yidian/shenghuoquan/border/dto/OrderConfirmDto.kt

@@ -14,8 +14,8 @@ data class OrderConfirmResDto(
 //    val price: Int? = null,
   @SerializedName("shipping")
   val shipping: Shipping? = null,
-  @SerializedName("take_place_list")
-  val takePlaceList: List<TakePlaceList>? = null
+//  @SerializedName("take_place_list")
+//  val takePlaceList: List<TakePlaceList>? = null
 ) : Parcelable
 
 @Parcelize
@@ -57,6 +57,10 @@ data class CouponList(
 data class GoodsList(
   @SerializedName("name")
   val name: String? = null,
+  @SerializedName("price") // 商品价格
+  val price: Double,
+  @SerializedName("goods_num") // 商品数量
+  val goodsNum: Int,
 ) : Parcelable
 
 /**
@@ -78,6 +82,8 @@ data class Shipping(
   val shippingId: String? = null,
   @SerializedName("take_place_id")
   val takePlaceId: Int? = null,
+  @SerializedName("take_place_name")
+  val takePlaceName: String? = null,
   @SerializedName("update_time")
   val updateTime: String? = null,
   @SerializedName("user_id")
@@ -85,13 +91,13 @@ data class Shipping(
 ) : Parcelable
 
 
-/**
- * 自提点列表
- */
-@Parcelize
-data class TakePlaceList(
-  @SerializedName("take_place_id")
-  val takePlaceId: Int? = null,// 自提点id
-  @SerializedName("take_place_name")
-  val takePlaceName: String? = null,// 自提点名称
-) : Parcelable
+///**
+// * 自提点列表
+// */
+//@Parcelize
+//data class TakePlaceList(
+//  @SerializedName("take_place_id")
+//  val takePlaceId: Int? = null,// 自提点id
+//  @SerializedName("take_place_name")
+//  val takePlaceName: String? = null,// 自提点名称
+//) : Parcelable

Components/BOrder/src/main/java/com/yidian/shenghuoquan/border/http/OrderApiService.kt

@@ -2,6 +2,7 @@ package com.yidian.shenghuoquan.border.http
 
 import com.yidian.bcommon.http.HttpResult
 import io.reactivex.rxjava3.core.Observable
+import retrofit2.http.Body
 import retrofit2.http.Headers
 import retrofit2.http.POST
 import retrofit2.http.QueryMap
@@ -48,7 +49,7 @@ interface OrderApiService {
   @Headers("Content-Type: application/json")
   fun requestOrderConfirm(
     @QueryMap commonParams: Map<String, String>,
-    @QueryMap requestParams: Map<String, String?>
+    @Body requestParams: Map<String, String?>
   ): Observable<HttpResult<Any?>>
 
   /**
@@ -58,7 +59,7 @@ interface OrderApiService {
   @Headers("Content-Type: application/json")
   fun requestCreateOrder(
     @QueryMap commonParams: Map<String, String>,
-    @QueryMap requestParams: Map<String, String?>
+    @Body requestParams: Map<String, String?>
   ): Observable<HttpResult<Any?>>
 
   /**
@@ -68,7 +69,7 @@ interface OrderApiService {
   @Headers("Content-Type: application/json")
   fun requestOrderPay(
     @QueryMap commonParams: Map<String, String>,
-    @QueryMap requestParams: Map<String, String?>
+    @Body requestParams: Map<String, String?>
   ): Observable<HttpResult<Any?>>
 
 }

Components/BOrder/src/main/java/com/yidian/shenghuoquan/border/ui/ConfirmOrderActivity.kt

@@ -2,39 +2,75 @@ package com.yidian.shenghuoquan.border.ui
 
 import android.content.Intent
 import androidx.activity.viewModels
+import com.yidian.bcommon.constant.XEventConfig
 import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.mvvm.BaseMvvmActivity
-import com.yidian.bcommon.utils.SensitiveInfoUtil
-import com.yidian.bcommon.utils.ToastUtils
 import com.yidian.shenghuoquan.border.R
+import com.yidian.shenghuoquan.border.adapter.OrderConfirmCommodityListAdapter
 import com.yidian.shenghuoquan.border.databinding.BorderActivityConfirmOrderBinding
+import com.yidian.shenghuoquan.border.dto.CouponList
+import com.yidian.shenghuoquan.border.dto.Shipping
+import com.yidian.xarc.xevent.XBaseEvent
+import com.yidian.xarc.xevent.XEventManager
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
 
 /**
  * 确认订单
  */
 class ConfirmOrderActivity : BaseMvvmActivity<BorderActivityConfirmOrderBinding, ConfirmOrderViewModel>() {
 
+  private val adapter by lazy { OrderConfirmCommodityListAdapter() }
+
   override val layoutId: Int = R.layout.border_activity_confirm_order
 
   override val vm: ConfirmOrderViewModel by viewModels()
 
   override fun initView() {
-    initClick()
+    XEventManager.register(this)
+    subscribeUiEvent()
+    initList()
     getIntentData(intent)
   }
 
+  private fun initList() {
+    binding.rvGoodsList.adapter = adapter
+  }
+
   private fun getIntentData(intent: Intent?) {
     val paramsMap = intent?.getSerializableExtra(XRouterPathConstants.ParamsKey)
     if (paramsMap != null) {
-      paramsMap as HashMap<*, *>
-      val marketingId = paramsMap["marketing_id"]
-      ToastUtils.showLongSafe("活动id: $marketingId")
+      paramsMap as HashMap<String, String?>
+      vm.requestConfirmOrderInfo(paramsMap)
     }
   }
 
-  private fun initClick() {
+  private fun subscribeUiEvent() {
+    vm.goodsSuccessEvent.observe(this, {
+      adapter.setList(it)
+    })
 
   }
 
+  override fun onDestroy() {
+    super.onDestroy()
+    XEventManager.unRegister(this)
+  }
+
+  @Subscribe(sticky = false, threadMode = ThreadMode.MAIN)
+  fun onEvent(event: XBaseEvent?) {
+    when (event?.name) {
+      XEventConfig.CONFIRM_ORDER_CHOOSE_POINT_SUCCESS -> {
+        // 选择自提点成功
+        val point = event.body as Shipping
+        vm.choosePickUpPointSuccess(point)
+      }
+      XEventConfig.CONFIRM_ORDER_CHOOSE_COUPON_SUCCESS -> {
+        // 选择优惠券成功
+        val coupon = event.body as CouponList
+        vm.chooseVoucherSuccess(coupon)
+      }
+    }
+  }
 
 }

Components/BOrder/src/main/java/com/yidian/shenghuoquan/border/ui/ConfirmOrderViewModel.kt

 package com.yidian.shenghuoquan.border.ui
 
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.yidian.bcommon.mvvm.BaseViewModel
+import com.yidian.bcommon.utils.ToastUtils
+import com.yidian.shenghuoquan.border.dto.CouponList
+import com.yidian.shenghuoquan.border.dto.GoodsList
+import com.yidian.shenghuoquan.border.dto.Shipping
+import com.yidian.shenghuoquan.border.http.OrderRemoteDataSource
 
 class ConfirmOrderViewModel : BaseViewModel() {
 
-  //  var selectedPickUpPoint = MutableLiveData<String>()
-  var receivingName = MutableLiveData<String>()
-  var receivingPhone = MutableLiveData<String>()
+  private var originalAmount: Double = 0.00// 原价总和
+  var couponAmount: Double = 0.00// 优惠券金额
 
-  //  var goodsList = MutableLiveData<String>()
-  var couponsAvailableNum = MutableLiveData<Int>()
-  var discountAmount = MutableLiveData<Double>()
-  var totalAmount = MutableLiveData<Double>()
+  var selectedPickUpPoint = MutableLiveData<Shipping?>()// 自提点
+  var receivingName = MutableLiveData<String>()// 收货人姓名
+  var receivingPhone = MutableLiveData<String>()//收货人电话
+  var selectedCoupon = MutableLiveData<CouponList>()// 选中的优惠券
+  var couponsAvailableNum = MutableLiveData<Int>()// 可用优惠券数量
+  var totalAmount = MutableLiveData(0.00)// 合计金额 = 原价 - 优惠
   var remark = MutableLiveData<String>()
 
+  /**
+   * 商品列表成功 Event
+   */
+  private val _goodsSuccessEvent = MutableLiveData<List<GoodsList>?>()
+  val goodsSuccessEvent: LiveData<List<GoodsList>?> = _goodsSuccessEvent
+
   /**
    * 请求订单信息
    */
-  fun requestOrderInfo() {
+  fun requestConfirmOrderInfo(paramsMap: HashMap<String, String?>) {
+//    val paramsMap = HashMap<String, String?>()
+//    paramsMap["business_from"] = "2"
+//    paramsMap["marketing_id"] = marketingId.toString()
+    OrderRemoteDataSource.requestOrderConfirm(paramsMap) {
+      if (it == null) {
+        return@requestOrderConfirm
+      }
+      selectedPickUpPoint.value = it.shipping
+      receivingName.value = it.shipping?.receiverName ?: ""
+      receivingPhone.value = it.shipping?.receiverMobile ?: ""
+      _goodsSuccessEvent.value = it.goodsList
+      calculateOriginalAmount(it.goodsList)
+      couponsAvailableNum.value = it.couponList?.size ?: 0 // 显示0张便于查看不能使用的优惠券
+
+    }
+  }
+
+  /**
+   * 计算商品原价 = 数量 * 单价
+   */
+  private fun calculateOriginalAmount(goodsList: List<GoodsList>?) {
+    if (goodsList.isNullOrEmpty()) {
+      return
+    }
+    goodsList.forEach {
+      originalAmount = originalAmount.plus(it.price * it.goodsNum)
+    }
+    // 计算出合计
+    calculateTotalAmount()
+  }
 
+  /**
+   * 计算商品合计 = 原价 - 优惠
+   */
+  private fun calculateTotalAmount() {
+    totalAmount.value = originalAmount - couponAmount
   }
 
+
   /**
    * 选择自提点
    */
   fun choosePickUpPoint() {
+    // todo 带过去当前选中自提点
+    ToastUtils.showLongSafe("去选择自提点")
+  }
 
+  fun choosePickUpPointSuccess(point: Shipping) {
+    selectedPickUpPoint.value = point
   }
 
   /**
    * 选择代金券
    */
   fun chooseVoucher() {
+    // todo 带过去当前选中优惠券
+    ToastUtils.showLongSafe("去选择优惠券")
+  }
 
+  fun chooseVoucherSuccess(coupon: CouponList) {
+    selectedCoupon.value = coupon
+    couponAmount = coupon.amount?.toDouble() ?: 0.00
+    // 重新计算相关金额
+    calculateTotalAmount()
   }
 
   /**
    * 创建订单
    */
   fun createOrder() {
+    val paramsMap = HashMap<String, String?>()
+    paramsMap["business_from"] = "2"
+    paramsMap["user_id"] = "510235230818"
+    // todo 添加其他参数
 
+    OrderRemoteDataSource.requestCreateOrder(paramsMap) {
+      ToastUtils.showShort("创建订单成功${it?.orderId}")
+    }
   }
 
   /**

Components/BOrder/src/main/java/com/yidian/shenghuoquan/border/ui/widget/OrderCommodityInfoView.kt

@@ -61,7 +61,7 @@ class OrderCommodityInfoView @JvmOverloads constructor(context: Context, attrs:
           vm.requestApplyRefund(it)
         }
 
-      }, null, R.color.color_5A968F)
+      }, null, R.color.color_FD7823)
     })
     // 监听申请退款接口请求结果
     vm.applyRefundResult.observe(context as LifecycleOwner, {

Components/BOrder/src/main/res/drawable/shape_coupons_num_bg.xml

@@ -4,5 +4,5 @@
 
     <corners android:radius="@dimen/dp9" />
 
-    <solid android:color="#D66948" />
+    <solid android:color="@color/color_FD7823" />
 </shape>
\ No newline at end of file

Components/BOrder/src/main/res/drawable/shape_pay_now_bg.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/color_5A968F" />
+    <solid android:color="@color/color_FD7823" />
 
     <corners android:radius="@dimen/dp18" />
 

Components/BOrder/src/main/res/drawable/shape_solid_d66948_corner_9.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/color_D66948" />
+    <solid android:color="@color/color_FD7823" />
 
     <corners android:radius="@dimen/dp9" />
 </shape>
\ No newline at end of file

Components/BOrder/src/main/res/layout/border_activity_confirm_order.xml

@@ -15,13 +15,14 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/color_F7F7F7"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <com.yidian.bcommon.widget.CommonTopBarView
             android:id="@+id/common_top_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/color_F6775B"
+            android:background="@color/color_FD7823"
             app:CommonTopBarView_title_text="确认订单" />
 
         <androidx.core.widget.NestedScrollView
@@ -51,16 +52,32 @@
                     android:paddingBottom="@dimen/dp20">
 
                     <TextView
-                        android:id="@+id/tv_pick_up"
+                        android:id="@+id/tv_please_choose_point"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:text="请选择自提点"
                         android:textColor="@color/black_333333"
                         android:textSize="@dimen/sp16"
+                        android:textStyle="bold"
+                        app:isShow="@{vm.selectedPickUpPoint.takePlaceName == null}"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintVertical_bias="0"
-                        tools:text="自提点" />
+                        tools:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/tv_pick_up"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="自提点"
+                        android:textColor="@color/black_333333"
+                        android:textSize="@dimen/sp16"
+                        app:isShow="@{vm.selectedPickUpPoint.takePlaceName != null}"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0" />
 
                     <TextView
                         android:id="@+id/tv_point_name"
@@ -68,8 +85,10 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp12"
                         android:gravity="center_vertical"
+                        android:text="@{vm.selectedPickUpPoint.takePlaceName}"
                         android:textColor="@color/black_333333"
                         android:textSize="@dimen/sp16"
+                        app:isShow="@{vm.selectedPickUpPoint.takePlaceName != null}"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toStartOf="@id/iv_next_arrow"
                         app:layout_constraintStart_toEndOf="@id/tv_pick_up"
@@ -92,8 +111,10 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/dp8"
+                        android:text="@{vm.selectedPickUpPoint.takePlaceName}"
                         android:textColor="@color/color_999999"
                         android:textSize="@dimen/sp14"
+                        app:isShow="@{vm.selectedPickUpPoint.takePlaceName != null}"
                         app:layout_constraintEnd_toStartOf="@id/iv_next_arrow"
                         app:layout_constraintStart_toStartOf="@id/tv_point_name"
                         app:layout_constraintTop_toBottomOf="@id/tv_point_name"
@@ -104,8 +125,10 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/dp8"
+                        android:text="@{@string/pickup_point_contract_person + vm.selectedPickUpPoint.receiverName + vm.selectedPickUpPoint.receiverMobile}"
                         android:textColor="@color/color_999999"
                         android:textSize="@dimen/sp14"
+                        app:isShow="@{vm.selectedPickUpPoint.takePlaceName != null}"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toStartOf="@id/iv_next_arrow"
                         app:layout_constraintStart_toStartOf="@id/tv_point_name"
@@ -205,15 +228,20 @@
                         android:id="@+id/rv_goods_list"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/dp16"
+                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/tv_goods_title" />
+                        app:layout_constraintTop_toBottomOf="@id/tv_goods_title"
+                        tools:itemCount="3"
+                        tools:listitem="@layout/border_item_order_confirm_commodity_list" />
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/cl_coupons"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/dp8"
+                        android:onClick="@{() -> vm.chooseVoucher()}"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/rv_goods_list">
@@ -225,14 +253,14 @@
                             android:drawableStart="@drawable/icon_red_envelope"
                             android:drawablePadding="@dimen/dp5"
                             android:singleLine="true"
+                            android:text="红包/优惠券"
                             android:textColor="@color/color_333333"
                             android:textSize="@dimen/sp14"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toStartOf="@id/tv_coupons_available"
                             app:layout_constraintHorizontal_bias="0"
                             app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
-                            tools:text="红包/优惠券" />
+                            app:layout_constraintTop_toTopOf="parent" />
 
                         <TextView
                             android:id="@+id/tv_coupons_available"
@@ -243,6 +271,7 @@
                             android:paddingTop="@dimen/dp2"
                             android:paddingEnd="@dimen/dp5"
                             android:paddingBottom="@dimen/dp2"
+                            android:text="@{vm.couponsAvailableNum + @string/coupons_available_num}"
                             android:textColor="@color/white"
                             android:textSize="11sp"
                             app:layout_constraintBottom_toBottomOf="parent"
@@ -277,37 +306,60 @@
                             android:id="@+id/tv_discount_amount_title"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:text="@string/discount_amount"
                             android:textColor="@color/color_333333"
                             android:textSize="@dimen/sp14"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toStartOf="@id/tv_discount_amount"
-                            app:layout_constraintTop_toTopOf="parent"
-                            tools:text="已优惠：" />
+                            app:layout_constraintBaseline_toBaselineOf="@id/tv_goods_total_amount"
+                            app:layout_constraintEnd_toStartOf="@id/tv_discount_amount" />
 
                         <TextView
                             android:id="@+id/tv_discount_amount"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginEnd="@dimen/dp10"
-                            android:textColor="@color/color_D66948"
+                            android:text="@{@string/renminbi + String.valueOf(vm.couponAmount)}"
+                            android:textColor="@color/color_FD7823"
                             android:textSize="@dimen/sp14"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toStartOf="@id/tv_goods_total_amount"
-                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintBaseline_toBaselineOf="@id/tv_goods_total_amount"
+                            app:layout_constraintEnd_toStartOf="@id/tv_goods_total_title"
                             tools:text="¥ 10.00" />
 
                         <TextView
-                            android:id="@+id/tv_goods_total_amount"
+                            android:id="@+id/tv_goods_total_title"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:text="@string/total_amount"
                             android:textColor="@color/color_333333"
                             android:textSize="@dimen/sp14"
+                            android:textStyle="bold"
+                            app:layout_constraintBaseline_toBaselineOf="@id/tv_goods_total_amount"
+                            app:layout_constraintEnd_toStartOf="@id/tv_goods_total_before" />
+
+                        <TextView
+                            android:id="@+id/tv_goods_total_before"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/renminbi"
+                            android:textColor="@color/color_333333"
+                            android:textSize="@dimen/sp14"
+                            android:textStyle="bold"
+                            app:layout_constraintBaseline_toBaselineOf="@id/tv_goods_total_amount"
+                            app:layout_constraintEnd_toStartOf="@id/tv_goods_total_amount" />
+
+                        <TextView
+                            android:id="@+id/tv_goods_total_amount"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{vm.totalAmount.toString()}"
+                            android:textColor="@color/color_333333"
+                            android:textSize="@dimen/sp18"
+                            android:textStyle="bold"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintHorizontal_bias="1"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent"
-                            tools:text="合计：¥35.00" />
+                            tools:text="35.00" />
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -400,14 +452,15 @@
             android:background="@color/white">
 
             <TextView
+                android:id="@+id/tv_total_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/color_5A968F"
+                android:text="合计：¥"
+                android:textColor="@color/color_FD7823"
                 android:textSize="@dimen/sp14"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/tv_total_amount"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:text="合计：¥" />
+                app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
                 android:id="@+id/tv_total_amount"
@@ -415,8 +468,10 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/dp12"
                 android:text="@{vm.totalAmount.toString()}"
-                android:textColor="@color/color_5A968F"
-                android:textSize="@dimen/sp14"
+                android:textColor="@color/color_FD7823"
+                android:textSize="@dimen/sp24"
+                android:textStyle="bold"
+                app:layout_constraintBaseline_toBaselineOf="@id/tv_total_title"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/tv_pay_now"
                 app:layout_constraintTop_toTopOf="parent"

Components/BOrder/src/main/res/layout/border_item_order_confirm_commodity_list.xml

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="@dimen/dp15">
+
+    <ImageView
+        android:id="@+id/iv_commodity_pic"
+        android:layout_width="@dimen/dp82"
+        android:layout_height="@dimen/dp60"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@drawable/img_order_commodity_placeholder" />
+
+    <TextView
+        android:id="@+id/tv_commodity_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp8"
+        android:ellipsize="end"
+        android:includeFontPadding="false"
+        android:maxLines="1"
+        android:textColor="@color/color_333333"
+        android:textSize="@dimen/sp15"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/iv_commodity_pic"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="肉末茄子+蔬蒸蛋套餐+肉沫豆角+清蒸鲈鱼" />
+
+    <TextView
+        android:id="@+id/tv_commodity_count"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp8"
+        android:includeFontPadding="false"
+        android:textColor="@color/color_999999"
+        android:textSize="@dimen/sp13"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toStartOf="@id/tv_commodity_name"
+        app:layout_constraintTop_toBottomOf="@id/tv_commodity_name"
+        tools:text="共2件" />
+
+    <TextView
+        android:id="@+id/tv_commodity_amount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp8"
+        android:includeFontPadding="false"
+        android:textColor="@color/color_333333"
+        android:textSize="@dimen/sp16"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toStartOf="@id/tv_commodity_name"
+        app:layout_constraintTop_toBottomOf="@id/tv_commodity_count"
+        tools:text="¥15.00" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

Components/BOrder/src/main/res/layout/border_view_order_commodity_info.xml

@@ -154,7 +154,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/dp8"
             android:text="@{'¥' + String.valueOf(data.discountFee)}"
-            android:textColor="@color/color_D66948"
+            android:textColor="@color/color_FD7823"
             android:textSize="@dimen/sp14"
             android:visibility="@{data.useCoupon == 1 ? View.VISIBLE : View.GONE}"
             app:layout_constraintBaseline_toBaselineOf="@id/tv_total_amount"

Components/BOrder/src/main/res/values/colors.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="color_F6775B">#F6775B</color>
     <color name="color_F7F7F7">#FFF7F7F7</color>
-    <color name="color_5A968F">#5A968F</color>
-    <color name="color_D66948">#D66948</color>
+    <color name="color_FD7823">#FD7823</color>
 </resources>
\ No newline at end of file

Components/BOrder/src/main/res/values/strings.xml

@@ -3,6 +3,7 @@
     <string name="order_detail">订单详情</string>
     <string name="pickup_point">自提点</string>
     <string name="pickup_point_contract">提货点联系人: %s %s</string>
+    <string name="pickup_point_contract_person">提货点联系人: </string>
     <string name="please_select_pickup_point">请选择自提点</string>
     <string name="consignee_name">收货姓名</string>
     <string name="consignee_phone">手机号码</string>
@@ -11,7 +12,9 @@
     <string name="contract_seller">联系卖家</string>
     <string name="apply_refund">申请退款</string>
     <string name="red_packet_or_coupon">红包/优惠券</string>
+    <string name="coupons_available_num">张优惠券可用</string>
     <string name="discount_amount">已优惠：</string>
+    <string name="renminbi">¥</string>
     <string name="total_amount">合计：</string>
     <string name="order_info">订单信息</string>
     <string name="order_no">订单编号</string>