PayStack支付修改

common/models/forms/ApproachOrderForm.php

@@ -301,7 +301,7 @@ class ApproachOrderForm extends Model
         }
 
         // 订单类型：userOrder(会员订单)、userUpgrade(会员升级)、userDec(会员报单)
-        $orderType = $customFields[1]['value'] ?? false;
+        $orderType = $this->note['metadata']['custom_fields'][1]['value'] ?? false;
 
         $db = \Yii::$app->db;
         $transaction = $db->beginTransaction();
@@ -335,11 +335,13 @@ class ApproachOrderForm extends Model
 
                     // 同步报单
                     DecOrder::insertOne($approachDecOrder);
+
                     // 修改会员锁定状态
-                    if (!User::updateAll(['STATUS' => 1], 'ID=:USER_ID', [':USER_ID' => $approachDecOrder['TO_USER_ID']])) {
-                        throw new Exception(Form::formatErrorsForApi('change user status error'));
+                    if (in_array($orderType, ['userDec', 'baUpgrade'])) {
+                        if (!User::updateAll(['STATUS' => 1], 'ID=:USER_ID', [':USER_ID' => $approachDecOrder['TO_USER_ID']])) {
+                            throw new Exception(Form::formatErrorsForApi('change user status error'));
+                        }
                     }
-
                     // 修改BA会员升级状态
                     if ($orderType === 'baUpgrade') {
                         // 查询BA会员名

common/models/forms/BaApproachOrderForm.php

@@ -280,7 +280,7 @@ class BaApproachOrderForm extends Model
         }
 
         // 订单类型：baOrder(BA订单)、baDec(BA报单)
-        $orderType = $customFields[1]['value'] ?? false;
+        $orderType = $this->note['metadata']['custom_fields'][1]['value'] ?? false;
 
         $db = \Yii::$app->db;
         $transaction = $db->beginTransaction();

common/models/forms/BaDeclarationForm.php

@@ -5,6 +5,7 @@ use common\components\Model;
 use common\helpers\Cache;
 use common\helpers\Date;
 use common\helpers\Form;
+use common\helpers\LoggerTool;
 use common\helpers\user\Cash;
 use common\helpers\user\Reconsume;
 use common\helpers\user\Info;

frontendEle/src/views/user/dec.vue

@@ -625,7 +625,7 @@ export default {
           _this.PayStackForm.amount = response.ORDER_AMOUNT
           _this.PayStackForm.metadata.custom_fields[0].value = response.SN
           if (_this.form.decType === 'ba') {
-            _this.PayStackForm.metadata.custom_fields[1].value = 'baDec';
+            _this.PayStackForm.metadata.custom_fields[1].value = 'baUpgrade';
           } else {
             _this.PayStackForm.metadata.custom_fields[1].value = 'userDec';
           }