Merge branch 'master' into dev

app-ghs/controllers/ConsoleController.php

@@ -175,7 +175,7 @@ class ConsoleController extends BaseController
         //$notice[] = ['title' => '客户多个订单开始支持一键分享', 'action' => '查看', 'page' => '/admin/book/detail?id=calc'];
         //$notice[] = ['title' => '急事请连续打二次电话 15280215347', 'action' => '', 'page' => ''];
         //$notice[] = ['title' => '新功能：客户端和后台使用跑腿的流程', 'action' => '', 'page' => '/admin/book/detail?id=use_pt'];
-        $notice[] = ['title' => '分享订单打不开的解决办法', 'action' => '查看', 'page' => '/admin/book/detail?id=calc'];
+        //$notice[] = ['title' => '分享订单打不开的解决办法', 'action' => '查看', 'page' => '/admin/book/detail?id=calc'];
 
         $mainId = $this->mainId;
         $respond = StatSaleClass::profile($mainId);

app-ghs/controllers/OrderClearController.php

@@ -264,8 +264,8 @@ class OrderClearController extends BaseController
             $custom = $return['custom'];
             $ghs = $return['ghs'];
             $customRecharge = $return['customRecharge'];
-            //结账
-            OrderClearClass::confirmClear($clear, $payWay);
+            //结账（现金已在 rechargeBalance 记过，不再重复入账）
+            OrderClearClass::confirmClear($clear, $payWay, ['skipCashMoney' => true]);
             $clearInfo = OrderClearClass::getLockById($id);
             //结账消余额
             CustomClass::clearConsumeBalance($amount, $custom, $ghs, $shop, $staff, $clearInfo);

app-ghs/controllers/PurchaseController.php

@@ -29,6 +29,11 @@ class PurchaseController extends BaseController
         if (empty($cg)) {
             util::fail('没有找到采购单');
         }
+        $payDate = substr($cg->payTime ?? '', 0, 10);
+        //2026年6月1号前的可以取这个数据，之后的不行
+        if ($payDate >= '2026-06-01') {
+            util::fail('该分享链接已失效');
+        }
         $salt = $cg->salt ?? '';
         if (empty($salt)) {
             util::fail('采购单信息无效');

app-hd/controllers/ClearController.php

@@ -187,8 +187,8 @@ class ClearController extends BaseController
             $return = CustomClass::rechargeBalance($custom, $amount, $shop, $staff, $payWay);
             $custom = $return['custom'];
             $ghs = $return['ghs'];
-            //结账
-            OrderClearClass::confirmClear($clear, $payWay);
+            //结账（充值销账链路，现金/余额已在 rechargeBalance 处理）
+            OrderClearClass::confirmClear($clear, $payWay, ['skipCashMoney' => true]);
             $clearInfo = OrderClearClass::getLockById($id);
             //结账消余额
             CustomClass::clearConsumeBalance($amount, $custom, $ghs, $shop, $staff, $clearInfo);

biz-ghs/order/classes/OrderClearClass.php

@@ -233,7 +233,7 @@ class OrderClearClass extends BaseClass
     }
 
     //确认结账 ssh 20220510
-    public static function confirmClear($clear, $payWay)
+    public static function confirmClear($clear, $payWay, $options = [])
     {
         if ($clear->status == 2) {
             util::fail('已结过账了');
@@ -288,8 +288,9 @@ class OrderClearClass extends BaseClass
         //供货商结账欠款减少
         \bizHd\ghs\classes\GhsClass::clearDebtAmountReduce($ghs, $custom, $amount, $clear);
 
-        //现金余额增加
-        if ($payWay == dict::getDict('payWay', 'cash')) {
+        //现金余额增加（充值销账链路里现金已在 rechargeBalance 记过，需 skipCashMoney）
+        $skipCashMoney = !empty($options['skipCashMoney']);
+        if (!$skipCashMoney && $payWay == dict::getDict('payWay', 'cash')) {
             $mainId = $ghs->mainId ?? 0;
             $main = MainClass::getLockById($mainId);
             if (empty($main)) {