支付调试优化

app/src/main/java/com/sw/dualscreen/viewmodel/UserViewModel.kt

@@ -5,7 +5,6 @@ import com.arcsoft.face.ErrorInfo
 import com.sw.dualscreen.GlobalData
 import com.sw.dualscreen.GlobalKey
 import com.sw.dualscreen.model.request.UserNutritionParam
-import com.sw.dualscreen.model.response.ApiResponse
 import com.sw.dualscreen.model.response.DinnerType
 import com.sw.dualscreen.model.response.FoodInfo
 import com.sw.dualscreen.model.response.FoodOrder
@@ -14,7 +13,6 @@ import com.sw.dualscreen.model.response.PayResult
 import com.sw.dualscreen.model.response.UserFaceModel
 import com.sw.dualscreen.model.response.UserFaceModel2
 import com.sw.dualscreen.model.response.UserNutrition
-import com.sw.dualscreen.model.response.UserNutritionData
 import com.sw.dualscreen.objbox.CollectedFoodInfo
 import com.sw.dualscreen.utils.GsonUtils
 import com.sw.dualscreen.utils.SPUtil
@@ -49,8 +47,8 @@ class UserViewModel : BaseViewModel() {
     val searchFoodInfoList: StateFlow<List<FoodInfo>> = _searchFoodInfoList
 
     // 就餐数据
-    private val _nutritionData = MutableStateFlow<UserNutritionData?>(null)
-    val nutritionData: StateFlow<UserNutritionData?> = _nutritionData
+//    private val _nutritionData = MutableStateFlow<UserNutritionData?>(null)
+//    val nutritionData: StateFlow<UserNutritionData?> = _nutritionData
 
     /**
      * 饭点类型  早餐/午餐/晚餐
@@ -388,15 +386,16 @@ class UserViewModel : BaseViewModel() {
         Timber.tag(TAG).d("queryOrderState")
         val response = repository.queryOrderState(orderNo = orderId)
         if (parseResponse(response)) {
-            val respData = response.data as? String
-                ?: if (response.data is Any) {
-                    GsonUtils.toJson(response.data)
-                } else {
-                    ""
-                }
-            val payResult = GsonUtils.fromJson(respData, PayResult::class.java)
-            val orderState = payResult?.paySuc == "1"
-            block(orderState)
+            //val respData = response.data as? String
+            //   ?: if (response.data is Any) {
+            //       GsonUtils.toJson(response.data)
+            //   } else {
+            //       ""
+            //   }
+            //al payResult = GsonUtils.fromJson(respData, PayResult::class.java)
+            //val orderState = payResult?.paySuc == "1"
+            //data=1的话 是支付成功 0是待支付
+            block(response.data == "1")
         } else {
             block(false)
         }