shish il y a 4 ans
Parent
commit
6d96832dbf

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

@@ -76,12 +76,14 @@ class OrderClearController extends BaseController
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         $name = $this->shopAdmin['name'] ?? '';
+        $complete = $post['complete'] ?? 0;
         $data = [
             'customId' => $customId,
             'ghsShopAdminId' => $this->shopAdminId,
             'ghsShopAdminName' => $name,
             'modifyPrice' => $modifyPrice,
             'payWay' => $payWay,
+            'complete' => $complete,
         ];
         try {
             $respond = OrderClearClass::clear($data, $id, $this->sjId, $this->shopId);

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

@@ -105,9 +105,8 @@ class OrderClearClass extends BaseClass
         }
         $return = PurchaseClearClass::add($clearData, true);
         $complete = $post['complete'] ?? 0;
-        //直接完成
         if ($complete == 1) {
-            self::confirmClear($clear);
+            self::confirmClear($return);
         }
         return $return;
     }