Merge branch 'master' into ls

app-ghs/controllers/ApplyController.php

@@ -92,8 +92,19 @@ class ApplyController extends BaseController
         $post = Yii::$app->request->post();
         $authCode = $post['authCode'] ?? '';
         $mobile = $post['mobile'] ?? '';
-        if (stringUtil::isMobile($mobile) == false) {
-            util::fail('请填写正确手机号');
+        if (empty($mobile)) {
+            util::fail('请填写手机号');
+        }
+        if (!stringUtil::isMobile($mobile)) {
+            util::fail('手机号错误');
+        }
+
+        $inviteCode = $post['inviteCode'] ?? '';
+        if (empty($inviteCode)) {
+            util::fail('请填写邀请码');
+        }
+        if ($inviteCode != 2025) {
+            util::fail('邀请码错误');
         }
 
         //避免重复提交

app-ghs/controllers/TestController.php

@@ -700,7 +700,7 @@ class TestController extends BaseController
     //零售订单查询 ssh 20231031
     public function actionLsTradeQuery()
     {
-        $shopId = 1490;
+        $shopId = 17117;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
             util::stop('没有找到门店21');
@@ -717,7 +717,7 @@ class TestController extends BaseController
         ];
         $laResource = new Lakala($params);
         $queryParams = [
-            'orderSn' => 'KD26596032',
+            'orderSn' => 'KD26608633',
             //'tradeNo' => '20231029110113130266215259252887',
         ];
         $response = $laResource->query($queryParams, 0);

app-hd/controllers/PurchaseClearController.php

@@ -108,6 +108,10 @@ class PurchaseClearController extends BaseController
         if ($order->status == PurchaseClearClass::STATUS_EXPIRE) {
             util::fail('账单已取消了');
         }
+
+        //避免重复提交
+        util::checkRepeatCommit($orderSn, 8);
+
         $oldOrderSn = $orderSn;
         $current = time();
         $id = $order->id;
@@ -164,15 +168,21 @@ class PurchaseClearController extends BaseController
                 'orderSn' => $oldOrderSn,
             ];
             $response = $laResource->close($closeParams);
-            if (isset($response['code']) == false || $response['code'] != 'BBS00000') {
+            if (!isset($response['code']) || $response['code'] != 'BBS00000') {
                 $msg = $response['msg'] ?? '';
                 $code = $response['code'] ?? 0;
-                if (!in_array($code, ['BBS11114'])) {
-                    $customMobile = $order->customMobile ?? '';
-                    $ghsName = $order->ghsName ?? '';
-                    noticeUtil::push('重点注意，花店结账，单号：' . $oldOrderSn . '，关单没有成功，原因：【' . $msg . '】，可能造成无法结账，客户手机号：' . $customMobile . '，供货商：' . $ghsName . '，客户端给提示的内容：出错了，请取消本单重试', '15280215347');
-                    util::fail('出错了，请取消本单重试');
-                }
+                $customMobile = $order->customMobile ?? '';
+                $ghsName = $order->ghsName ?? '';
+                //noticeUtil::push('第一个，花店结账，单号：' . $oldOrderSn . '，关单没有成功，原因：【' . $msg . '】，' . $code . '，客户手机号：' . $customMobile . '，供货商：' . $ghsName, '15280215347');
+            }
+
+            //收银台关单
+            $closeParams = ['orderSn' => $orderSn];
+            $response = $laResource->cashClose($closeParams);
+            if (!isset($response['code']) || $response['code'] != '000000') {
+                $msg = $response['msg'] ?? '';
+                $code = $response['code'] ?? 0;
+                //noticeUtil::push('第二个，花店结账，单号：' . $oldOrderSn . '，收银台关单没有成功，原因：【' . $msg . '】，' . $code, '15280215347');
             }
 
             $newOrderSn = orderSn::getPurchaseClearSn();
@@ -265,6 +275,9 @@ class PurchaseClearController extends BaseController
         }
         $totalFee = $order->actPrice;
 
+        //避免重复提交
+        util::checkRepeatCommit($orderSn, 8);
+
         $capitalType = dict::getDict('capitalType', 'hdPurchaseClear', 'id');
         $ghsShopId = $order->ghsShopId ?? 0;
         $ghsShop = ShopClass::getById($ghsShopId, true);

app-hd/controllers/PurchaseController.php

@@ -956,6 +956,9 @@ class PurchaseController extends BaseController
             util::fail('商家支付功能未开通');
         }
 
+        //避免重复提交
+        util::checkRepeatCommit($orderSn, 8);
+
         //已经唤起过支付了，根据拉卡拉的规则，需要生成新的订单号
         if ($order->changePrice == 2) {
             $oldOrderSn = $orderSn;
@@ -1068,6 +1071,9 @@ class PurchaseController extends BaseController
             util::fail('订单已失效，请重新下单');
         }
 
+        //避免重复提交
+        util::checkRepeatCommit($orderSn, 8);
+
         $ghsId = $order->ghsId ?? 0;
         $ghs = GhsClass::getById($ghsId, true);
         if (empty($ghs)) {

biz-ghs/clear/classes/ClearClass.php

@@ -48,13 +48,14 @@ class ClearClass extends BaseClass
         ];
         $laResource = new Lakala($params);
         $refundReason = '';
-        $aliParams = [
+        $thirdNo = $clear->thirdNo ?? '';
+        $backParams = [
             'refundSn' => $refundOrderSn,
-            'orderSn' => $orderSn,
+            'thirdNo' => $thirdNo,
             'refundAmount' => $refundFee,
             'refundReason' => $refundReason,
         ];
-        $response = $laResource->refund($aliParams);
+        $response = $laResource->refund($backParams);
         if (!isset($response['code']) || $response['code'] != 'BBS00000') {
             $errMsg = $response['msg'] ?? '';
             return ['status' => 0, 'msg' => $errMsg];

biz-ghs/product/classes/ProductClass.php

@@ -1164,7 +1164,7 @@ class ProductClass extends BaseClass
                 if (isset($product['mainId']) == false || $product['mainId'] != $mainId) {
                     $name = $product['name'] ?? '';
                     $pMainId = $product['mainId'] ?? 0;
-                    noticeUtil::push("只能选择同一家的商品哦！{$name} {$pMainId} {$mainId}", '15280215347');
+                    //noticeUtil::push("只能选择同一家的商品哦！{$name} {$pMainId} {$mainId}", '15280215347');
                     util::fail($name . ' 不是同家的商品，请清空重选');
                 }
             }

biz-hd/cg/classes/CgRefundClass.php

@@ -54,13 +54,15 @@ class CgRefundClass extends BaseClass
         ];
         $laResource = new Lakala($params);
         $refundReason = '';
-        $aliParams = [
+        //退款用拉卡拉原单号比较稳定，用自己内部的单号，好像会出现找不到订单号的情况
+        $thirdNo = $cg->thirdNo ?? '';
+        $backParams = [
             'refundSn' => $refundOrderSn,
-            'orderSn' => $orderSn,
+            'thirdNo' => $thirdNo,
             'refundAmount' => $refundFee,
             'refundReason' => $refundReason,
         ];
-        $response = $laResource->refund($aliParams);
+        $response = $laResource->refund($backParams);
         if (!isset($response['code']) || $response['code'] != 'BBS00000') {
             $errMsg = $response['msg'] ?? '';
             return ['status' => 0, 'msg' => $errMsg];

biz-hd/order/classes/OrderClass.php

@@ -226,7 +226,7 @@ class OrderClass extends BaseClass
     {
         $order = self::getByCondition(['orderSn' => $orderSn], true);
         if (empty($order)) {
-            noticeUtil::push('散客下单，付款成功，支付回调，单号：' . $orderSn . '，没有找到订单', '15280215347');
+            noticeUtil::push('散客下单，付款成功，支付回调，单号：' . $orderSn . ' 金额：' . $totalFee . ' 回调id：' . $transactionId . '，没有找到订单', '15280215347');
             $msg = "没有找到零售订单 orderSn:{$orderSn}";
             Yii::info($msg);
             util::fail($msg);

biz-hd/purchase/classes/PurchaseClass.php

@@ -71,7 +71,7 @@ class PurchaseClass extends BaseClass
         $cost = dict::getDict('kmPackCost');
         if (getenv('YII_ENV') == 'production') {
             //云漫梦金鹏 徐记花卉 康多鲜 旭海 打包费0元
-            if (in_array($mainId, [10728, 20528, 10866,38657,41121])) {
+            if (in_array($mainId, [10728, 20528, 10866, 38657, 41121])) {
                 $cost = dict::getDict('kmPackCost2');
             }
             //花瀚鲜花供应链
@@ -1013,7 +1013,7 @@ class PurchaseClass extends BaseClass
             $list[$key]['debtAmount'] = $ghsInfo[$ghsId]['debtAmount'] ?? '';
 
             //剩余欠款
-            $balance = $ghsInfo[$ghsId]['balance']??0;
+            $balance = $ghsInfo[$ghsId]['balance'] ?? 0;
             $debtAmount = $ghsInfo[$ghsId]['debtAmount'] ?? 0;
             $ghsSalt = $ghsInfo[$ghsId]['salt'] ?? '';
             $remainDebtAmount = bcsub($debtAmount, $balance, 2);
@@ -1146,23 +1146,21 @@ class PurchaseClass extends BaseClass
         $laResource = new Lakala($params);
         $closeParams = ['orderSn' => $orderSn];
         $response = $laResource->close($closeParams);
-        if (isset($response['code']) == false || $response['code'] != 'BBS00000') {
+        if (!isset($response['code']) || $response['code'] != 'BBS00000') {
             $msg = $response['msg'] ?? '';
             $code = $response['code'] ?? 0;
-            if (!in_array($code, ['BBS11114'])) {
-                noticeUtil::push('花店采购 ' . $orderSn . ' 关单没有成功哦' . $msg . ' ' . $code, '15280215347');
-            }
+            //主扫（手机上微信下单拉取微信支付）调用这个方法有效，如果收银机上扫客户收款码的，调用这个方法无效，具体说明看 https://o.lakala.com/#/home/document/detail?id=115 所以在这个取消方法，暂时不考虑关单成功与否 ssh 20250517
+            //noticeUtil::push('花店采购 ' . $orderSn . ' 关单没有成功哦' . $msg . ' ' . $code, '15280215347');
         }
 
         //收银台关单
         $closeParams = ['orderSn' => $orderSn];
         $response = $laResource->cashClose($closeParams);
-        if (isset($response['code']) == false || $response['code'] != '000000') {
+        if (!isset($response['code']) || $response['code'] != '000000') {
             $msg = $response['msg'] ?? '';
             $code = $response['code'] ?? 0;
-            if (!in_array($code, ['000091'])) {
-                noticeUtil::push('花店采购 ' . $orderSn . ' 收银台支付宝 关单没有成功哦 ' . $msg . ' ' . $code, '15280215347');
-            }
+            //聚合收银台（APP发起的微信和支付支付）调用这个方法有效，说明 https://o.lakala.com/#/home/document/detail?id=722，其他情况调用无法，所以在这个取消方法，暂时不考虑关单成功与否 ssh 20250517
+            //noticeUtil::push('花店采购 ' . $orderSn . ' 收银台关单的提示：' . $msg . ' ' . $code, '15280215347');
         }
 
         return $purchase;

biz-hd/refund/classes/HdRefundClass.php

@@ -38,13 +38,14 @@ class HdRefundClass extends BaseClass
         ];
         $laResource = new Lakala($params);
         $refundReason = '';
-        $aliParams = [
+        $thirdNo = $order->thirdNo ?? '';
+        $backParams = [
             'refundSn' => $refundSn,
-            'orderSn' => $xsOrderSn,
+            'thirdNo' => $thirdNo,
             'refundAmount' => $refundFee,
             'refundReason' => $refundReason,
         ];
-        $response = $laResource->refund($aliParams);
+        $response = $laResource->refund($backParams);
         if (!isset($response['code']) || $response['code'] != 'BBS00000') {
             $errMsg = $response['msg'] ?? '';
             return ['status' => 0, 'msg' => $errMsg];

common/components/lakala/Lakala.php

@@ -283,7 +283,7 @@ class Lakala
     //退款 ssh 20231009
     public function refund($params)
     {
-        $orderSn = $params['orderSn'];
+        $orderSn = $params['orderSn'] ?? '';
         $refundSn = $params['refundSn'];
         $refundReason = $params['refundReason'];
         $refundAmount = $params['refundAmount'];