shish 5 лет назад
Родитель
Сommit
b197bab581

+ 3 - 0
app-ghs/controllers/OrderClearController.php

@@ -45,6 +45,8 @@ class OrderClearController extends BaseController
             }
         }
 
+        $payWay = Yii::$app->request->post('payWay',0);
+
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         $name = $this->shopAdmin['name'] ?? '';
@@ -53,6 +55,7 @@ class OrderClearController extends BaseController
             'ghsShopAdminId' => $this->shopAdminId,
             'ghsShopAdminName' => $name,
             'modifyPrice' => $modifyPrice,
+            'payWay'=>$payWay,
         ];
         try {
             OrderClearClass::clear($data, $id, $this->sjId, $this->shopId);

+ 2 - 0
biz-ghs/order/classes/OrderClearClass.php

@@ -94,6 +94,7 @@ class OrderClearClass extends BaseClass
         $customShop->save();
 
         $orderSn = orderSn::getPurchaseClearSn();
+        $payWay = $post['payWay'] ?? dict::getDict('payWay', 'wxPay');
         $clearData = [
             'prePrice' => $amount,
             'actPrice' => $modifyPrice,
@@ -118,6 +119,7 @@ class OrderClearClass extends BaseClass
             'customAddress' => $custom['address'] ?? '',
             'deadline' => date("Y-m-d H:i:s"),
             'purchaseIds' => $purchaseString,
+            'payWay' => $payWay,
         ];
         if ($modifyPrice < $amount) {
             $clearData['discountAmount'] = bcsub($amount, $modifyPrice, 2);