批发端：微信支付宝扫码收款

零售端：支付宝付款、微信付款、买花和虚拟买花

app-ghs/controllers/OrderController.php

@@ -704,20 +704,23 @@ class OrderController extends BaseController
             util::success(['returnStatus' => 'FAILURE'], $msg);
         }
 
-
         $codePayErrorKey = 'code_pay_error_' . $id;
         $hasFailPay = Yii::$app->redis->executeCommand('GET', [$codePayErrorKey]);
         //前面有付失败过，要重新生成单号
         if (!empty($hasFailPay)) {
             $oldOrderSn = $orderSn;
-            $orderSn = orderSn::getPurchaseSn();
+            $shopId = $cg->shopId ?? 0;
+            $mainId = $cg->mainId ?? 0;
+            $ghsId = $cg->ghsId ?? 0;
+            $customId = $cg->customId ?? 0;
+            $snData = ['shopId' => $shopId, 'mainId' => $mainId, 'ghsId' => $ghsId, 'customId' => $customId];
+            $orderSn = orderSn::getPurchaseSn($snData);
             $cg->orderSn = $orderSn;
             $cg->save();
             //noticeUtil::push("重新扫码，成功更换单号 {$oldOrderSn} {$orderSn}", '15280215347');
             PurchaseItemClass::updateByCondition(['orderSn' => $oldOrderSn], ['orderSn' => $orderSn]);
         }
 
-
         $shop = $this->shop;
         $sj = $shop->merchantName;
         $shopName = $shop->shopName;

app-ghs/controllers/TestController.php

@@ -1011,70 +1011,12 @@ class TestController extends BaseController
 
     public function actionAliRun2()
     {
-        $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
-        $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/lkl-apigw-v1.cer';
-        $params = [
-            'appid' => 'OP00002119',
-            'serial_no' => '018b08cfddbd',
-            'merchant_no' => '82240505992000N',
-            'term_no' => 'C6337694',
-            'merchantPrivateKeyPath' => $merchantPrivateKeyPath,
-            'lklCertificatePath' => $lklCertificatePath,
-        ];
-        $outTradeNo = orderSn::getPurchaseSn();
-        $notifyUrl = Yii::$app->params['hdHost'] . "/notice/pay-callback";
-        $currentCapitalType = dict::getDict('capitalType', 'xhPurchase', 'id');
-        $aliParams = [
-            'orderSn' => $outTradeNo,
-            'amount' => 0.16,
-            'capitalType' => $currentCapitalType,
-            'notifyUrl' => $notifyUrl,
-        ];
-        $laResource = new Lakala($params);
-        $response = $laResource->driveAliPay($aliParams);
-        if ($response && isset($response['cmdRetCode']) && $response['cmdRetCode'] == 'GLOBAL_SUCCESS') {
-            echo '<pre>';
-            echo "下单成功<br/>";
-            print_r($response);
-        } else {
-            echo '<pre>';
-            echo "下单失败<br/>";
-            print_r($response);
-        }
+
     }
 
     public function actionAliRun3()
     {
-        $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
-        $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/lkl-apigw-v1.cer';
-        $params = [
-            'appid' => 'OP00002119',
-            'serial_no' => '018b08cfddbd',
-            'merchant_no' => '82240505992000N',
-            'term_no' => 'C6337694',
-            'merchantPrivateKeyPath' => $merchantPrivateKeyPath,
-            'lklCertificatePath' => $lklCertificatePath,
-        ];
-        $laResource = new Lakala($params);
-        $outTradeNo = orderSn::getPurchaseSn();
-        $notifyUrl = Yii::$app->params['hdHost'] . "/notice/pay-callback";
-        $currentCapitalType = dict::getDict('capitalType', 'xhPurchase', 'id');
-        $wxParams = [
-            'orderSn' => $outTradeNo,
-            'amount' => 0.16,
-            'capitalType' => $currentCapitalType,
-            'notifyUrl' => $notifyUrl,
-        ];
-        $response = $laResource->driveWxPay($wxParams);
-        if ($response && isset($response['cmdRetCode']) && $response['cmdRetCode'] == 'GLOBAL_SUCCESS') {
-            echo '<pre>';
-            echo "下单成功<br/>";
-            print_r($response);
-        } else {
-            echo '<pre>';
-            echo "下单失败<br/>";
-            print_r($response);
-        }
+
     }
 
     //dada 城市code

app-hd/controllers/PurchaseController.php

@@ -1039,8 +1039,12 @@ class PurchaseController extends BaseController
                     noticeUtil::push('注意花店买花更换单号：' . $oldOrderSn . '，关单没有成功（收银台-支付宝），' . $msg, '15280215347');
                 }
             }
-
-            $newOrderSn = orderSn::getPurchaseSn();
+            $shopId = $order->shopId ?? 0;
+            $mainId = $order->mainId ?? 0;
+            $customId = $order->customId ?? 0;
+            $ghsId = $order->ghsId ?? 0;
+            $snData = ['shopId' => $shopId, 'mainId' => $mainId, 'customId' => $customId, 'ghsId' => $ghsId];
+            $newOrderSn = orderSn::getPurchaseSn($snData);
             $orderSn = $newOrderSn;
             $order->orderSn = $newOrderSn;
             $order->save();
@@ -1171,7 +1175,11 @@ class PurchaseController extends BaseController
                 }
             }
 
-            $newOrderSn = orderSn::getPurchaseSn();
+            $shopId = $order->shopId ?? 0;
+            $mainId = $order->mainId ?? 0;
+            $customId = $order->customId ?? 0;
+            $snData = ['shopId' => $shopId, 'mainId' => $mainId, 'customId' => $customId, 'ghsId' => $ghsId];
+            $newOrderSn = orderSn::getPurchaseSn($snData);
             $orderSn = $newOrderSn;
             $order->orderSn = $newOrderSn;
             $order->save();

biz-hd/purchase/classes/PurchaseClass.php

@@ -186,7 +186,8 @@ class PurchaseClass extends BaseClass
         foreach ($productIds as $productId) {
             $product = ProductClass::getById($productId, true);
             $oldStocks[$productId] = $product;
-        }        self::takeToPutIn($cg);
+        }
+        self::takeToPutIn($cg);
         $shop = ShopClass::getLockById($cg->shopId);
         if (empty($shop)) {
             util::fail('没有找到门店14');
@@ -300,11 +301,11 @@ class PurchaseClass extends BaseClass
             $formNum = ProductClass::formatStock($product->stock, $ratio); //花材的库存转换
             $itemInfo[] = [
                 'productId' => $productId,
-                'itemNum'   => $product->stock, // 回滚为入库前的库存
-                'itemId'    => $product->itemId,
-                'bigNum'    => $formNum['bigNum'],
-                'smallNum'  => $formNum['smallNum'],
-                'price'     => $product->price,
+                'itemNum' => $product->stock, // 回滚为入库前的库存
+                'itemId' => $product->itemId,
+                'bigNum' => $formNum['bigNum'],
+                'smallNum' => $formNum['smallNum'],
+                'price' => $product->price,
             ];
         }
 
@@ -334,11 +335,11 @@ class PurchaseClass extends BaseClass
             $formNum = ProductClass::formatStock($newStock, $ratio); //花材的库存转换
             $itemInfo[] = [
                 'productId' => $productId,
-                'itemNum'   => $newStock, // 新库存数
-                'itemId'    => $product->itemId,
-                'bigNum'    => $formNum['bigNum'],
-                'smallNum'  => $formNum['smallNum'],
-                'price'     => $product->price,
+                'itemNum' => $newStock, // 新库存数
+                'itemId' => $product->itemId,
+                'bigNum' => $formNum['bigNum'],
+                'smallNum' => $formNum['smallNum'],
+                'price' => $product->price,
             ];
         }
 
@@ -716,16 +717,25 @@ class PurchaseClass extends BaseClass
     //添加采购 ssh 2021.1.18
     public static function addPurchase($data, $ghs)
     {
-        $orderSn = orderSn::getPurchaseSn();
+        $shopId = $data['shopId'] ?? 0;
+        $sjId = $data['sjId'] ?? 0;
+        $mainId = $data['mainId'] ?? 0;
+        $ghsId = $data['ghsId'] ?? 0;
+        $book = $data['book'] ?? 0;
+        $shopAdminId = $data['shopAdminId'] ?? 0;
+        $customId = $data['customId'] ?? 0;
+
+        $snData = ['shopId' => $shopId, 'mainId' => $mainId, 'ghsId' => $ghsId, 'customId' => $customId];
+        $orderSn = orderSn::getPurchaseSn($snData);
         $data['orderSn'] = $orderSn;
         $prePrice = 0;
-        $live = isset($ghs['live']) ? $ghs['live'] : 1;
-        $sendTimeWant = isset($data['sendTimeWant']) && !empty($data['sendTimeWant']) ? $data['sendTimeWant'] : date("Y-m-d");
+        $live = $ghs['live'] ?? 1;
+        $sendTimeWant = !empty($data['sendTimeWant']) ? $data['sendTimeWant'] : date("Y-m-d");
         if ($sendTimeWant < date("Y-m-d")) {
             util::fail('您选了过去时间');
         }
         $data['sendTimeWant'] = $sendTimeWant;
-        if (isset($data['product']) == false || empty($data['product'])) {
+        if (empty($data['product'])) {
             util::fail('请选择花材17');
         }
         $productList = $data['product'];
@@ -734,12 +744,6 @@ class PurchaseClass extends BaseClass
 
         //传过来的是供货商的productId，需要转换为零售端的productId
         //数据格式 [{"productId":"113","bigNum":1,"smallNum":0,"classId":"-2","hdProductId":1}]
-        $shopId = $data['shopId'] ?? 0;
-        $sjId = $data['sjId'] ?? 0;
-        $mainId = $data['mainId'] ?? 0;
-        $ghsId = $data['ghsId'] ?? 0;
-        $book = $data['book'] ?? 0;
-        $shopAdminId = $data['shopAdminId'] ?? 0;
 
         if ($live == 1) {
             //花店真实向批发店采购花材，因为拿的供货商的ID，所以需要转化花店的id

common/components/orderSn.php

@@ -169,13 +169,14 @@ class orderSn
     }
 
     //零售商采购单号 ssh 2021.1.19
-    public static function getPurchaseSn()
+    public static function getPurchaseSn($params = [])
     {
         $prefix = 'CG_CS';
         if (getenv('YII_ENV', 'local') == 'production') {
             $prefix = 'CG';
         }
-        $respond = \bizHd\purchase\classes\PurchaseSnClass::add(['id' => null]);
+        $params['id'] = null;
+        $respond = \bizHd\purchase\classes\PurchaseSnClass::add($params);
         $id = $respond['id'] ?? 0;
         if (empty($id)) {
             util::fail('采购单号没有生成');