增加支付接口相关逻辑

app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt

@@ -121,6 +121,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
     private fun initData() {
 //        viewModel.getEquipmentToken()
         viewModel.getUserFaceCache(pageNo = 1)
+       //viewModel.getUserFaceCache2()
+
 //        presentation?.step1()
         presentation?.step1FoodRecognizing()
     }
@@ -219,7 +221,15 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                     ToastUtils.showToast("暂无识别数据，请搜索选择")
                     return@setOnClickListener
                 }
-                createOrder(checkedItem!!)
+
+                val realWeight = (lastWeight * 1000).roundToInt()
+                createOrder(foodInfo = checkedItem!!, foodWeight = realWeight, eatWeight = realWeight) {
+                    presentation?.dismiss()
+                    startActivity(Intent(this, PayActivity::class.java).apply {
+                        putExtra(PayActivity.FOOD_INFO, checkedItem!!)
+                        putExtra(PayActivity.FOOD_ORDER_ID, foodOrderId)
+                    })
+                }
             }
         }
     }
@@ -656,19 +666,18 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         lastTouchTime = System.currentTimeMillis()
     }
 
-    private fun createOrder(foodInfo: FoodInfo) {
+    fun createOrder(foodInfo: FoodInfo, foodWeight: Int, eatWeight: Int, block:()-> Unit) {
         val mode = SPUtil.getInstance().get(GlobalKey.KEY_CHARGE_MODE, 0)
-        val realWeight = (lastWeight * 1000).roundToInt()
         val order = FoodOrder(
             deviceId = GlobalData.deviceId,
             foodId = foodInfo.foodId,
             foodName = foodInfo.foodName ?: "",
             foodMaterialId = foodInfo.foodMaterialId ?: "",
             specId = foodInfo.specId ?: "",
-            foodWeight = realWeight,
-            eatWeight = realWeight,
+            foodWeight = foodWeight,
+            eatWeight = eatWeight,
             //根据specId对应规格重量计算
-            eatNum = getEatNum(realWeight, foodInfo.specWeight ?: 0.0),
+            eatNum = getEatNum(foodWeight, foodInfo.specWeight ?: 0.0),
             userId = null,
             notPay = mode != 0,
         )
@@ -679,12 +688,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                     return@runOnUiThread
                 }
                 foodOrderId = orderId
-                presentation?.dismiss()
-                startActivity(Intent(this, PayActivity::class.java).apply {
-                    putExtra(PayActivity.FOOD_INFO, foodInfo)
-                    putExtra(PayActivity.FOOD_ORDER_ID, orderId)
-                })
-//                ToastUtils.showToast("订单已生成")
+                block()
             }
         }
     }