add 订单详情联系卖家逻辑

CommonLib/BCommon/src/main/AndroidManifest.xml

@@ -11,6 +11,8 @@
     <!--高德地图 允许程序访问CellID或WiFi热点来获取的位置-->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <!--允许程序拔打电话-->
+    <uses-permission android:name="android.permission.CALL_PHONE" />
 
 
     <application>

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

@@ -13,19 +13,19 @@ data class OrderDetailDto(
   val appid: String,
   @SerializedName("audit_status")
   val auditStatus: Int,
-  @SerializedName("audit_time")
+  @SerializedName("audit_time") // 审核时间，商家拒绝退款时间取此字段
   val auditTime: String,
   @SerializedName("business_from")
   val businessFrom: Int,
   @SerializedName("close_time")
   val closeTime: String,
-  @SerializedName("comment")
+  @SerializedName("comment") // 订单备注
   val comment: String,
-  @SerializedName("coupon_list")
+  @SerializedName("coupon_list") // 优惠券信息
   val couponList: List<Coupon>,
   @SerializedName("create_time")
   val createTime: String,
-  @SerializedName("discount_fee")
+  @SerializedName("discount_fee") // 优惠金额
   val discountFee: Double,
   @SerializedName("is_refund")
   val isRefund: Int,
@@ -35,19 +35,19 @@ data class OrderDetailDto(
   val lifeAccountId: String,
   @SerializedName("life_account_name")
   val lifeAccountName: String,
-  @SerializedName("marketing_id")
+  @SerializedName("marketing_id") // 活动id
   val marketingId: Int,
-  @SerializedName("marketing_name")
+  @SerializedName("marketing_name") // 活动名称
   val marketingName: String,
   @SerializedName("merge_order_item_list")
   val mergeOrderItemList: List<MergeOrderItem>,
-  @SerializedName("order_id")
+  @SerializedName("order_id") // 订单id
   val orderId: String,
   @SerializedName("order_item_list")
   val orderItemList: List<OrderItem>,
-  @SerializedName("order_shipping_info")
+  @SerializedName("order_shipping_info") // 收货人信息
   val orderShippingInfo: OrderShippingInfo,
-  @SerializedName("order_status")
+  @SerializedName("order_status") // 订单状态
   val orderStatus: Int,
   @SerializedName("order_status_text")
   val orderStatusText: String,
@@ -55,21 +55,21 @@ data class OrderDetailDto(
   val orderType: Int,
   @SerializedName("pay_expiration_time")
   val payExpirationTime: String,
-  @SerializedName("pay_time")
+  @SerializedName("pay_time") // 支付时间
   val payTime: String,
-  @SerializedName("payment")
+  @SerializedName("payment") // 支付金额
   val payment: Int,
-  @SerializedName("place_list")
+  @SerializedName("place_list") // 自提点信息
   val placeList: PlaceList,
   @SerializedName("post_fee")
   val postFee: Int,
   @SerializedName("receive_time")
   val receiveTime: String,
-  @SerializedName("refund_amount")
+  @SerializedName("refund_amount") // 退款金额
   val refundAmount: Int,
-  @SerializedName("refund_apply_time")
+  @SerializedName("refund_apply_time") // 退款申请时间
   val refundApplyTime: String,
-  @SerializedName("refund_finish_time")
+  @SerializedName("refund_finish_time") // 退款时间
   val refundFinishTime: String,
   @SerializedName("shop_id")
   val shopId: String,
@@ -112,7 +112,7 @@ data class Coupon(
 
 data class MergeOrderItem(
   @SerializedName("desc_pic_url")
-  val descPicUrl: String,
+  val descPicUrl: List<String>,
   @SerializedName("goods_name")
   val goodsName: String,
   @SerializedName("goods_num")
@@ -127,12 +127,12 @@ data class OrderItem(
   @SerializedName("create_time")
   val createTime: String,
   @SerializedName("desc_pic_url")
-  val descPicUrl: String,
+  val descPicUrl: List<String>,
   @SerializedName("expiration_time")
   val expirationTime: String,
-  @SerializedName("goods_name")
+  @SerializedName("goods_name") // 商品名称
   val goodsName: String,
-  @SerializedName("goods_num")
+  @SerializedName("goods_num") // 商品数量
   val goodsNum: Int,
   @SerializedName("goods_sale_type")
   val goodsSaleType: Int,
@@ -147,7 +147,7 @@ data class OrderItem(
   @SerializedName("goods_version")
   val goodsVersion: Int,
   @SerializedName("introduce_pic_url")
-  val introducePicUrl: String,
+  val introducePicUrl: List<String>,
   @SerializedName("is_used")
   val isUsed: Int,
   @SerializedName("marketing_id")
@@ -160,7 +160,7 @@ data class OrderItem(
   val orderItemId: String,
   @SerializedName("payment")
   val payment: Int,
-  @SerializedName("price")
+  @SerializedName("price") // 商品价格
   val price: Double,
   @SerializedName("refund_amount")
   val refundAmount: Int,
@@ -193,11 +193,11 @@ data class OrderShippingInfo(
   val createTime: String,
   @SerializedName("order_id")
   val orderId: String,
-  @SerializedName("receiver_address")
+  @SerializedName("receiver_address") // 收货人地址
   val receiverAddress: String,
-  @SerializedName("receiver_mobile")
+  @SerializedName("receiver_mobile") // 收货人手机号码
   val receiverMobile: String,
-  @SerializedName("receiver_name")
+  @SerializedName("receiver_name") // 收货人名称
   val receiverName: String,
   @SerializedName("take_place_id")
   val takePlaceId: Int,
@@ -208,13 +208,13 @@ data class OrderShippingInfo(
 )
 
 data class PlaceList(
-  @SerializedName("address")
+  @SerializedName("address") // 自提点地址
   val address: String,
   @SerializedName("area")
   val area: String,
   @SerializedName("city")
   val city: String,
-  @SerializedName("contact_name")
+  @SerializedName("contact_name") // 自提点联系人姓名
   val contactName: String,
   @SerializedName("create_time")
   val createTime: String,
@@ -228,13 +228,13 @@ data class PlaceList(
   val location: String,
   @SerializedName("longitude")
   val longitude: String,
-  @SerializedName("phone")
+  @SerializedName("phone") // 自提点联系人手机号码
   val phone: String,
   @SerializedName("province")
   val province: String,
   @SerializedName("take_place_id")
   val takePlaceId: Int,
-  @SerializedName("take_place_name")
+  @SerializedName("take_place_name") // 自提点名称
   val takePlaceName: String,
   @SerializedName("update_time")
   val updateTime: String

Components/BOrder/src/main/java/com/yidian/shenghuoquan/border/viewmodel/OrderCommodityInfoViewModel.kt

 package com.yidian.shenghuoquan.border.viewmodel
 
+import android.content.Intent
+import android.net.Uri
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import com.yidian.bcommon.app.YdBaseApplication
 import com.yidian.bcommon.mvvm.BaseViewModel
 import com.yidian.shenghuoquan.border.http.OrderRemoteDataSource
 import com.yidian.shenghuoquan.border.http.callback.IApplyRefundCallback
@@ -29,9 +32,14 @@ class OrderCommodityInfoViewModel : BaseViewModel() {
 
   /**
    * 联系卖家
+   * 打开拨号界面
+   * @param phone 电话号码
    */
-  fun contractSeller() {
-
+  fun contractSeller(phone: String) {
+    val intent = Intent(Intent.ACTION_DIAL)
+    intent.data = Uri.parse("tel:$phone")
+    intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+    YdBaseApplication.context.startActivity(intent)
   }
 
   /**

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

@@ -22,7 +22,7 @@
             android:id="@+id/iv_commodity_pic"
             android:layout_width="@dimen/dp82"
             android:layout_height="@dimen/dp60"
-            app:commodityImageUrl="@{data.descPicUrl}"
+            app:commodityImageUrl="@{data.descPicUrl.get(0)}"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:src="@drawable/img_order_commodity_placeholder" />

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

@@ -9,8 +9,6 @@
 
         <import type="com.yidian.shenghuoquan.border.manager.OrderStatus" />
 
-        <import type="java.util.List" />
-
         <variable
             name="vm"
             type="com.yidian.shenghuoquan.border.viewmodel.OrderCommodityInfoViewModel" />
@@ -84,7 +82,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp8"
             android:background="@drawable/shape_stroke_e5e5e5_corner_14"
-            android:onClick="@{() -> vm.contractSeller()}"
+            android:onClick="@{() -> vm.contractSeller(data.placeList.phone)}"
             android:paddingStart="@dimen/dp13"
             android:paddingTop="@dimen/dp9"
             android:paddingEnd="@dimen/dp13"