批发端结账

app-ghs/controllers/CustomController.php

@@ -169,9 +169,9 @@ class CustomController extends BaseController
         if (isset($info['long']) && empty($info['long'])) {
             $info['address'] = '';
         }
-        $shopId = $info['shopId'] ?? 0;
+        $mainId = $info['mainId'] ?? 0;
         //超管的信息
-        $superInfo = ShopAdminClass::getManager($shopId);
+        $superInfo = ShopAdminClass::getManager($mainId);
         $superName = $superInfo['name'] ?? '';
         $currentSuper = ['name' => $superName];
         $info['superInfo'] = $currentSuper;

app-ghs/controllers/OrderClearController.php

@@ -7,6 +7,7 @@ use bizGhs\custom\classes\CustomClass;
 use bizGhs\order\classes\OrderClearClass;
 use bizHd\purchase\classes\PurchaseClearClass;
 use common\components\dateUtil;
+use common\components\dict;
 use Yii;
 use common\components\util;
 
@@ -97,7 +98,9 @@ class OrderClearController extends BaseController
     //确认结账 ssh 20220510
     public function actionConfirmClear()
     {
-        $id = Yii::$app->request->get('id');
+        $get = Yii::$app->request->get();
+        $id = $get['id'] ?? 0;
+        $payWay = $get['payWay'] ?? dict::getDict('payWay', 'wxPay');
         $clear = OrderClearClass::getById($id, true);
         if (empty($clear)) {
             util::fail('没有找到结账单');
@@ -110,7 +113,7 @@ class OrderClearController extends BaseController
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
-            OrderClearClass::confirmClear($clear);
+            OrderClearClass::confirmClear($clear, $payWay);
             $transaction->commit();
         } catch (\Exception $exception) {
             $transaction->rollBack();

app-ghs/controllers/OrderController.php

@@ -904,8 +904,8 @@ class OrderController extends BaseController
         $info['hasCloudPrint'] = $hasCloudPrint;
 
         //店长信息
-        $customShopId = $info['customShopId'] ?? 0;
-        $superInfo = ShopAdminClass::getManager($customShopId);
+        $mainId = $info['mainId']??0;
+        $superInfo = ShopAdminClass::getManager($mainId);
         $info['customSuper'] = $superInfo;
 
         $purchaseId = $info['purchaseId'] ?? 0;

biz-ghs/order/classes/OrderClearClass.php

@@ -69,7 +69,7 @@ class OrderClearClass extends BaseClass
         }
 
         $orderSn = orderSn::getPurchaseClearSn();
-        $payWay = $post['payWay'] ?? dict::getDict('payWay', 'unPay');
+        $payWay = isset($post['payWay']) && is_numeric($post['payWay']) ? $post['payWay'] : dict::getDict('payWay', 'unPay');
         $clearData = [
             'prePrice' => $amount,
             'actPrice' => $modifyPrice,
@@ -104,11 +104,16 @@ class OrderClearClass extends BaseClass
             util::fail('结账金额大于总欠款金额');
         }
         $return = PurchaseClearClass::add($clearData, true);
+        $complete = $post['complete'] ?? 0;
+        //直接完成
+        if ($complete == 1) {
+            self::confirmClear($clear);
+        }
         return $return;
     }
 
     //确认结账 ssh 20220510
-    public static function confirmClear($clear)
+    public static function confirmClear($clear, $payWay)
     {
         if ($clear->status == 2) {
             util::fail('已结过账了');
@@ -122,6 +127,10 @@ class OrderClearClass extends BaseClass
             $clear->save();
             util::fail('已取消了哦');
         }
+        $clear->payWay = $payWay;
+        $clear->status = 2;
+        $clear->save();
+
         $clearId = $clear->id ?? 0;
         $customId = $clear->customId ?? 0;
         $custom = CustomClass::getLockById($customId);

biz/shop/classes/ShopAdminClass.php

@@ -84,9 +84,9 @@ class ShopAdminClass extends BaseClass
     }
 
     //取店长信息 ssh 2021.1.8
-    public static function getManager($shopId)
+    public static function getManager($mainId)
     {
-        $relate = self::getByCondition(['shopId' => $shopId, 'founder' => 2]);
+        $relate = self::getByCondition(['mainId' => $mainId, 'founder' => 2]);
         $adminId = isset($relate['adminId']) ? $relate['adminId'] : 0;
         $info = [];
         if (!empty($adminId)) {