确认订单添加立即支付和选择自提点的埋点

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/buserorder/dto/OrderConfirmDto.kt

@@ -52,6 +52,8 @@ data class CouponDto(
  */
 @Parcelize
 data class GoodsDto(
+  @SerializedName("goods_sku_id")
+  val goodsSkuId: String? = null,
   @SerializedName("goods_name")// 商品名称
   val goodsName: String? = null,
   @SerializedName("price") // 商品价格

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/buserorder/ui/ConfirmOrderActivity.kt

@@ -102,6 +102,7 @@ class ConfirmOrderActivity : BaseMvvmActivity<BorderActivityConfirmOrderBinding,
         map[IntentConstants.KEY_EXTRA_PICKUP_POINT_ID] = it
         map[IntentConstants.KEY_EXTRA_MARKETING_ID] = id
         XPageManager.push(XRouterPathConstants.PICKUP_POINT_ACTIVITY, map)
+        vm.commitClickBuriedPoint(2)
       }
     }
     vm.toOrderDetailEvent.observe(this) {
@@ -178,7 +179,7 @@ class ConfirmOrderActivity : BaseMvvmActivity<BorderActivityConfirmOrderBinding,
 
   override fun onDoBack() {
     // 返回按钮
-    vm.commitBackBuriedPoint()
+    vm.commitClickBuriedPoint(1)
     XPageManager.pop(null)
   }
 

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/buserorder/viewmodel/ConfirmOrderViewModel.kt

@@ -5,12 +5,9 @@ import androidx.lifecycle.MutableLiveData
 import com.google.gson.Gson
 import com.yidian.bcommon.mvvm.BaseViewModel
 import com.yidian.bcommon.mvvm.ErrorInfo
-import com.yidian.bcommon.services.ZapServiceActionConstants
-import com.yidian.bcommon.services.ZapServiceNameConstants
 import com.yidian.bcommon.utils.CPointUtils
 import com.yidian.shenghuoquan.buserorder.dto.*
 import com.yidian.shenghuoquan.buserorder.http.OrderRemoteDataSource
-import com.yidian.yac.core.zap.ZapTicket
 import org.json.JSONArray
 import org.json.JSONObject
 
@@ -197,6 +194,7 @@ class ConfirmOrderViewModel : BaseViewModel() {
         }
       }
     }
+    commitClickBuriedPoint(3)
   }
 
   /**
@@ -240,8 +238,7 @@ class ConfirmOrderViewModel : BaseViewModel() {
     val skuNameText = StringBuilder()
     val value = _goodsSuccessEvent.value
     value?.forEachIndexed { index, s ->
-      // todo 改成skuID
-      skuIdText.append(s.goodsName)
+      skuIdText.append(s.goodsSkuId)
       skuNameText.append(s.goodsName)
       if (index < value.size - 1) {
         skuIdText.append(",")
@@ -270,9 +267,11 @@ class ConfirmOrderViewModel : BaseViewModel() {
   }
 
   /**
-   * 点击返回按钮的埋点
+   * 点击按钮的埋点
+   *
+   * 点击： 1.返回按钮，则上报return_key; 2.选择自提点，则上报self_pick_up_site; 3.立即支付，则上报immediate_payment
    */
-  fun commitBackBuriedPoint() {
+  fun commitClickBuriedPoint(weightKey: Int) {
     val jsonObject = JSONObject()
     jsonObject.put("eventName", "CLICK_WIDGET")
     val contextJsonObject = JSONObject()
@@ -286,7 +285,13 @@ class ConfirmOrderViewModel : BaseViewModel() {
     val entitiesJsonObject = JSONObject()
     val widgetInfoJsonObject = JSONObject()
     widgetInfoJsonObject.put("widget_type", "BUTTON")
-    widgetInfoJsonObject.put("widget_name", "return_key")
+    var weightName = ""
+    when (weightKey) {
+      1 -> weightName = "return_key"
+      2 -> weightName = "self_pick_up_site"
+      3 -> weightName = "immediate_payment"
+    }
+    widgetInfoJsonObject.put("widget_name", weightName)
     entitiesJsonObject.put("widget_info", widgetInfoJsonObject)
     jsonObject.put("entitiesMap", entitiesJsonObject)
     val propertiesJsonObject = JSONObject()