Browse Source

[new]调整会员购买流程

zk 3 months ago
parent
commit
b9ac43625c
2 changed files with 7 additions and 7 deletions
  1. 2 2
      lib/helper/member_pay_helper.dart
  2. 5 5
      lib/module/member/member_controller.dart

+ 2 - 2
lib/helper/member_pay_helper.dart

@@ -41,10 +41,11 @@ class MemberPayHelper implements PaymentStatusCallback {
       ToastUtil.show(StringName.memberPleaseChoiceGoods);
       return;
     }
-    if (payWay == null && !Platform.isIOS) {
+    if (payWay == null) {
       ToastUtil.show(StringName.memberPleaseChoicePayment);
       return;
     }
+    memberRepository.setLastSelectedMember(bean, payWay);
     //增加渠道登录判断
     if (Platform.isAndroid && atmobPlatformInfo.tgPlatform == ChannelId.sd) {
       if (!AccountRepository.getInstance().isLogin.value) {
@@ -62,7 +63,6 @@ class MemberPayHelper implements PaymentStatusCallback {
 
     LoadingDialog.show(StringName.payLoading,
         backDismiss: true, clickMaskDismiss: true);
-    memberRepository.setLastSelectedMember(bean, payWay);
     try {
       final RequestPayResponse response = await MemberRepository.getInstance()
           .submitAndRequestPay(

+ 5 - 5
lib/module/member/member_controller.dart

@@ -318,14 +318,17 @@ class MemberController extends BaseController implements PaymentStatusCallback {
   }
 
   void onBuyClick() async {
-    if (selectedGoods == null) {
+    final buyGoods = selectedGoods;
+    final buyPayWay = selectedPayWay;
+    if (buyGoods == null) {
       ToastUtil.show(StringName.memberPleaseChoiceGoods);
       return;
     }
-    if (selectedPayWay == null && !Platform.isIOS) {
+    if (buyPayWay == null) {
       ToastUtil.show(StringName.memberPleaseChoicePayment);
       return;
     }
+    memberRepository.setLastSelectedMember(buyGoods, buyPayWay);
     //增加渠道登录判断
     if (Platform.isAndroid && atmobPlatformInfo.tgPlatform == ChannelId.sd) {
       if (!accountRepository.isLogin.value) {
@@ -336,8 +339,6 @@ class MemberController extends BaseController implements PaymentStatusCallback {
         }
       }
     }
-    final buyGoods = selectedGoods!;
-    final buyPayWay = selectedPayWay!;
 
     int goodsId = buyGoods.id;
     int payPlatform = buyPayWay.payPlatform;
@@ -347,7 +348,6 @@ class MemberController extends BaseController implements PaymentStatusCallback {
 
     LoadingDialog.show(StringName.payLoading,
         backDismiss: true, clickMaskDismiss: true);
-    memberRepository.setLastSelectedMember(buyGoods, buyPayWay);
     memberRepository
         .submitAndRequestPay(
             goodsId: goodsId, payPlatform: payPlatform, payMethod: payMethod)