feat(payment): 添加会员折扣功能并重构支付逻辑

- 新增 getMemberDiscount 接口用于查询会员折扣
- 在人脸识别支付中集成会员折扣计算逻辑
- 将支付金额计算从 vipPrice 切换到 specPrice 并应用会员折扣
- 在初始化活动中添加设备配置获取功能
- 使用 ConstraintLayout 重构主餐品列表布局
- 添加 Timber 日志框架替换原有 Log 工具
- 重构 MainScreenPresentation 中的食物价格计算逻辑
- 移除重复的设备配置获取代码，统一在 InitActivity 中处理

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

@@ -17,9 +17,11 @@ import com.sw.dualscreen.objbox.FoodModule
 import com.sw.dualscreen.utils.FoodVectorTool
 import com.sw.dualscreen.utils.L
 import com.sw.dualscreen.utils.NetworkUtils
+import com.sw.dualscreen.utils.SpTool
 import com.sw.dualscreen.viewmodel.BaseViewModel
 import com.sw.dualscreen.viewmodel.UserViewModel
 import com.sw.plate.utils.AppUtil
+import com.sw.plate.utils.ToastUtils
 import kotlinx.coroutines.launch
 
 class InitActivity : BaseActivity<ActivityInitBinding>() {
@@ -180,11 +182,32 @@ class InitActivity : BaseActivity<ActivityInitBinding>() {
                     loadNetworkErrorDialog()
                     return
                 }
+                getDeviceConfig()
                 getCollectedFoodVector()
             }
         }
     }
 
+    private fun getDeviceConfig() {
+        userViewModel.getDeviceConfig { deviceConfig ->
+            runOnUiThread {
+                if (deviceConfig == null) {
+                    ToastUtils.showToast("获取设备配置数据失败")
+                    return@runOnUiThread
+                }
+                var settlementMode = 1
+                //结算模式：1-独立支付，2-联合结算
+                //settlementMode = if (deviceConfig.payType == 2) 0 else 1
+                // TODO: 2022/10/13 修改为独立支付
+                SpTool.settlementMode = settlementMode
+
+                GlobalData.appId = deviceConfig.arcsoftAppId ?: ""
+                GlobalData.sdkKey = deviceConfig.arcsoftSdkKey ?: ""
+                GlobalData.activeKey = deviceConfig.arcsoftActiveKey ?: ""
+            }
+        }
+    }
+
     private fun loadNetworkErrorDialog() {
         RemindDialog(
             context = context,

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

@@ -86,6 +86,7 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import org.json.JSONObject
+import timber.log.Timber
 import java.io.File
 import java.time.LocalDateTime
 import java.time.ZoneId
@@ -200,6 +201,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
 
     override fun initialize() {
         super.initialize()
+        settlementMode = SpTool.settlementMode
         isPageVisible = true
         // 拦截扫码枪按键事件，防止触发页面按钮点击
         registerKeyEvent()
@@ -212,9 +214,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         initData()
     }
 
-    private fun initLayoutEatDetailBinding(mode: Int) {
+    private fun initLayoutEatDetailBinding() {
+        Timber.tag(TAG).d("initLayoutEatDetailBinding,settlementMode=$settlementMode")
         binding.flFoodList.removeAllViews()
-        if (mode == 0) {
+        if (settlementMode == 0) {
             //联合支付
             val b = LayoutMainFoodList2Binding.inflate(layoutInflater, binding.flFoodList, true)
             rvFoodList = b.rvFoodList
@@ -255,25 +258,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
     }
 
     private fun initView() {
-        initLayoutEatDetailBinding(SpTool.settlementMode)
-        viewModel.getDeviceConfig { deviceConfig ->
-            runOnUiThread {
-                if (deviceConfig == null) {
-                    ToastUtils.showToast("获取设备配置数据失败")
-                    initLayoutEatDetailBinding(SpTool.settlementMode)
-                    return@runOnUiThread
-                }
-                //结算模式：1-独立支付，2-联合结算
-                settlementMode = if (deviceConfig.payType == 2) 0 else 1
-                SpTool.settlementMode = settlementMode
-
-                GlobalData.appId = deviceConfig.arcsoftAppId ?: ""
-                GlobalData.sdkKey = deviceConfig.arcsoftSdkKey ?: ""
-                GlobalData.activeKey = deviceConfig.arcsoftActiveKey ?: ""
-                viewModel.activeEngine()
-                initLayoutEatDetailBinding(settlementMode)
-            }
-        }
+        viewModel.activeEngine()
+        initLayoutEatDetailBinding()
         updateDateTime()
         binding.tvTitleTime.setOnClickListener {
             EnvSwitchDialog(context = this, onEnvChanged = {

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

@@ -166,6 +166,8 @@ class PayActivity : BaseActivity<ActivityPayBinding>() {
         super.onDestroy()
     }
 
+    var memberDiscount = 1.0
+
     var memberInfo: MemberInfo? = null
     fun showPayInfo(type: Int = 1, isVip: Boolean = false, memberInfo: MemberInfo? = null) {
         this.memberInfo = memberInfo
@@ -191,9 +193,19 @@ class PayActivity : BaseActivity<ActivityPayBinding>() {
             it.type = type
             it.foodName = foodInfo?.foodName
             //确认使用vipPrice 还是 specPrice
-            val onePrice = if (isVip) foodInfo?.vipPrice else foodInfo?.specPrice
-            it.totalPrice = (onePrice ?: 0.0) * eatNum
-            presentation.initView()
+            //val onePrice = if (isVip) foodInfo?.vipPrice else foodInfo?.specPrice
+            if (isVip) {
+                userViewModel.getMemberDiscount(memberInfo?.faceUserId?:"") { discount ->
+                    memberDiscount = if (discount == null) 1.0 else discount / 10
+                    var onePrice = foodInfo?.specPrice ?: 0.0
+                    onePrice = if (isVip) onePrice * memberDiscount else onePrice
+                    it.totalPrice = onePrice * eatNum
+                    presentation.initView()
+                }
+            } else {
+                it.totalPrice = (foodInfo?.specPrice ?: 0.0) * eatNum
+                presentation.initView()
+            }
         }
     }
 

app/src/main/java/com/sw/dualscreen/activity/fragment/pay/FacePayFragment.kt

@@ -23,7 +23,9 @@ class FacePayFragment : BaseFragment<FragmentFacePayBinding>() {
 //        }
         payActivity.foodInfo?.let {
             foodName = it.foodName
-            payAmount = (it.vipPrice ?: 0.0) * payActivity.eatNum
+//            payAmount = (it.vipPrice ?: 0.0) * payActivity.eatNum
+            val price = it.specPrice ?: 0.0
+            payAmount = price * payActivity.memberDiscount * payActivity.eatNum
         }
         showSubScreen()
     }

app/src/main/java/com/sw/dualscreen/activity/fragment/pay/PayResultFragment.kt

@@ -75,7 +75,9 @@ class PayResultFragment : BaseFragment<FragmentPayResultBinding>() {
         }
 
         if (memberInfo != null && memberInfo!!.member) {
-            totalPrice = (payActivity.foodInfo?.vipPrice ?: 0.0) * payActivity.eatNum
+//            totalPrice = (payActivity.foodInfo?.vipPrice ?: 0.0) * payActivity.eatNum
+            val price = payActivity.foodInfo?.specPrice ?: 0.0
+            totalPrice = price * payActivity.memberDiscount * payActivity.eatNum
             binding.layoutVip.visible()
             balance = (memberInfo!!.topUpBalance ?: 0.0) + (memberInfo!!.rewardBalance ?: 0.0)
             realPayPrice = if (balance >= totalPrice) 0.0 else totalPrice - balance