bugfix: EK-1569: 报单时无法使用PayStack支付.

common/models/forms/ApproachReconsumeOrderForm.php

@@ -44,52 +44,35 @@ class ApproachReconsumeOrderForm extends Model
 {
     public $sn;
     public $status;
-    public $addressId;
-    public $note;
+    public $remark;
     public $type;
-    public $decLv;
-    public $packageId;
+    public $addressId;
+    public $payType;
     public $goodsId;
     public $goodsNum;
-    public $insertUserName;
-    public $password;
     public $payPassword;
-    public $realName;
-    public $insertUserIdCard;
-    public $mobile;
     public $email;
-    public $address;
-    public $openBank;
-    public $bankAddress;
-    public $bankNo;
-    public $bankProvince;
-    public $bankCity;
-    public $bankCounty;
-    public $conUserName;
-    public $recUserName;
+    public $period;
+
+    public $userName;
     public $decUserName;
-    public $location;
     public $consignee;
     public $acceptMobile;
-    public $countryId;
     public $province;
     public $city;
-    public $county;
-    public $cityName;
     public $lgaName;
-    public $remark;
-    public $payType;
-    public $userName;
+    public $cityName;
+    public $county;
     public $detailaddress;
 
-    // 传过来的全部数据
-    public $allData;
+    private $_address;
     private $_decAmount;
     private $_decPv;
+    private $_freight;
+    private $_payAmount;
     private $_orderGoods;
     private $_standardAmount;
     private $_decAmountStandard;
-    public $period;
 
     /**
      * @var ApproachOrder
@@ -227,7 +210,6 @@ class ApproachReconsumeOrderForm extends Model
         $goods = ShopGoods::find()->select('ID,CATEGORY_TYPE')->where(['in', 'ID', $this->goodsId])->andWhere(['STATUS' => 1])->asArray()->all();
         if (!$goods) {
             throw new Exception(Yii::t('app', 'orderCanNotContainMultipleProductCategories'));
-            return;
         }
         $goodsCategoryType = array_unique(array_column($goods, 'CATEGORY_TYPE'));
         if (count($goodsCategoryType) > 1) {