营养接口调试、支付接口联调

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

@@ -87,6 +87,12 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                 checkedItem = item
                 notifyDataSetChanged()
                 updateCurrentFood(item)
+
+                val mode = SPUtil.getInstance().get(GlobalKey.KEY_CHARGE_MODE, 0)
+                //不计费模式切换菜品，重新加载数据
+                if(mode == 1) {
+                    presentation?.loadUnbilledMode()
+                }
             }
         }
     }
@@ -222,8 +228,19 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                     return@setOnClickListener
                 }
 
-                val realWeight = (lastWeight * 1000).roundToInt()
-                createOrder(foodInfo = checkedItem!!, foodWeight = realWeight, eatWeight = realWeight) {
+                //val realWeight = (lastWeight * 1000).roundToInt()
+                val mealPickupMode = SPUtil.getInstance().get(GlobalKey.KEY_PICKUP_MODE, 0) ?: 0
+                val eatWeight = if (mealPickupMode == 0) {
+                    //即放即取
+                    presentation?.recognitionWeight?:0.0
+                } else {
+                    presentation?.recognitionWeight?.minus(lastWeight)?:0.0
+                }
+                createOrder(
+                    foodInfo = checkedItem!!,
+                    foodWeight = presentation?.lastWeight?.roundToInt()?:0,
+                    eatWeight = eatWeight.roundToInt()
+                ) {
                     presentation?.dismiss()
                     startActivity(Intent(this, PayActivity::class.java).apply {
                         putExtra(PayActivity.FOOD_INFO, checkedItem!!)
@@ -684,7 +701,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         viewModel.createOrder(order) { orderId ->
             runOnUiThread {
                 if (orderId.isBlank()) {
-                    ToastUtils.showToast("订单id为空")
+                    //ToastUtils.showToast("订单id为空")
                     return@runOnUiThread
                 }
                 foodOrderId = orderId