确认订单进订单详情关闭当前页面

Components/BUserOrder/src/main/assets/order.json

-{
-  "goods_list": [
-    {
-      "goods_sku_id": "04qc5lTabXrHgbjpCpke",
-      "goods_sku_num": 1,
-      "marketing_id": 38,
-      "marketing_type": 4
-    }
-  ],
-  "business_from": 2,
-  "marketing_id": 38
-}
\ No newline at end of file

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

 package com.yidian.shenghuoquan.buserorder.ui
 
 import android.content.Intent
-import android.text.InputFilter
 import android.text.InputFilter.LengthFilter
 import androidx.activity.viewModels
+import com.pingplusplus.android.Pingpp
+import com.pingplusplus.android.Pingpp.REQUEST_CODE_PAYMENT
 import com.yidian.bcommon.constant.IntentConstants
 import com.yidian.bcommon.constant.XEventConfig
 import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.bcommon.mvvm.BaseMvvmActivity
+import com.yidian.bcommon.utils.InputFilterUtil
+import com.yidian.bcommon.widget.CommonHintDialog
 import com.yidian.shenghuoquan.buserorder.R
 import com.yidian.shenghuoquan.buserorder.adapter.OrderConfirmCommodityListAdapter
 import com.yidian.shenghuoquan.buserorder.databinding.BorderActivityConfirmOrderBinding
 import com.yidian.shenghuoquan.buserorder.dto.PickupPoint
+import com.yidian.shenghuoquan.buserorder.viewmodel.ConfirmOrderViewModel
 import com.yidian.xarc.xevent.XBaseEvent
 import com.yidian.xarc.xevent.XEventManager
 import com.yidian.xpage.XPageManager
+import com.yidian.xpage.XPageViewProtocol
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import org.json.JSONObject
 import timber.log.Timber
-import com.pingplusplus.android.Pingpp
-import com.pingplusplus.android.Pingpp.REQUEST_CODE_PAYMENT
-import com.yidian.bcommon.utils.InputFilterUtil
-import com.yidian.bcommon.utils.ToastUtils
-import com.yidian.bcommon.widget.CommonHintDialog
-import com.yidian.shenghuoquan.buserorder.viewmodel.ConfirmOrderViewModel
-import com.yidian.xpage.XPageViewProtocol
 
 
 /**
@@ -73,15 +71,6 @@ class ConfirmOrderActivity : BaseMvvmActivity<BorderActivityConfirmOrderBinding,
   }
 
   private fun parsingParameters(jsonObject: JSONObject) {
-//    // 解析本地json数据
-//    val jsonStr = JsonUtils.file2JsonStr(this, "order.json")
-//    jsonStr?.let {
-//      val jsonObject = JSONObject(it)
-//      Timber.tag("确认订单").e("订单请求参数JSON：${jsonObject}")
-//      marketingId = jsonObject.optInt("marketing_id").toString()
-//      requestConfirmOrder(jsonObject)
-//    }
-
     Timber.tag("确认订单").e("订单请求参数JSON：${jsonObject}")
     marketingId = jsonObject.optInt("marketing_id").toString()
     requestConfirmOrder(jsonObject)
@@ -114,6 +103,9 @@ class ConfirmOrderActivity : BaseMvvmActivity<BorderActivityConfirmOrderBinding,
       }
     }
     vm.toOrderDetailEvent.observe(this) {
+      // 关闭确认订单
+      finish()
+      // 打开订单详情
       val map = HashMap<String, Any?>()
       map[IntentConstants.KEY_EXTRA_ORDER_ID] = it
       XPageManager.push(XRouterPathConstants.ORDER_DETAIL_ACTIVITY, map)

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

@@ -5,7 +5,6 @@ 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.utils.ToastUtils
 import com.yidian.shenghuoquan.buserorder.dto.*
 import com.yidian.shenghuoquan.buserorder.http.OrderRemoteDataSource
 import org.json.JSONArray
@@ -183,7 +182,6 @@ class ConfirmOrderViewModel : BaseViewModel() {
     currentParamsJson.put("comment", remark.value)
     OrderRemoteDataSource.requestCreateOrder(currentParamsJson) {
       it?.let {
-        ToastUtils.showShort("创建订单成功${it.orderId}")
         if (it.payment == 0) {// 0元单不用支付直接进订单详情
           _toOrderDetailEvent.value = it.orderId
         } else {
@@ -203,7 +201,6 @@ class ConfirmOrderViewModel : BaseViewModel() {
     requestParams["pay_method_id"] = "105"// 微信 App 支付
     OrderRemoteDataSource.requestPayOrder(requestParams) {
       it?.let {
-        ToastUtils.showShortSafe("获取charge成功：${it.size}")
         // 调起支付
         _toPaymentEvent.value = Gson().toJson(it[0].v)
       }

Components/BXBridBusiness/src/main/java/com/yidian/shenghuoquan/bxbirdbusiness/ui/CommonWebViewActivity.kt

@@ -49,7 +49,7 @@ class CommonWebViewActivity : BaseMvvmActivity<XbridActivityCommonWebViewBinding
         return
       }
       url = webViewUrl
-      Timber.e("页面的URL ： $webViewUrl")
+      Timber.tag("CommonWebView").e("页面的URL ： $webViewUrl")
       initPublishCommodityWebView(webViewUrl)
     }
   }