Merge branch 'master' into dev

app-ghs/controllers/ConsoleController.php

@@ -172,8 +172,8 @@ 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=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'];
 

app-ghs/controllers/OrderController.php

@@ -2173,6 +2173,32 @@ class OrderController extends BaseController
         util::success($info);
     }
 
+    //通过订单获取采购单分享salt ssh 20260521
+    public function actionCgSalt()
+    {
+        $get = Yii::$app->request->get();
+        $id = $get['id'] ?? 0;
+        if (empty($id)) {
+            util::fail('请求参数错误');
+        }
+        $order = OrderClass::getById($id, true);
+        if (empty($order)) {
+            util::fail('没有找到订单');
+        }
+		if($order->mainId != $this->mainId){
+			util::fail('不是你的订单哈。');
+		}
+        $purchaseId = $order->purchaseId ?? 0;
+        if (empty($purchaseId)) {
+            util::fail('没有找到采购单');
+        }
+        $cg = PurchaseClass::getById($purchaseId);
+        if (empty($cg)) {
+            util::fail('没有找到采购单');
+        }
+        util::success(['purchaseId' => $purchaseId, 'cgSalt' => $cg['salt'] ?? '']);
+    }
+
     //获取订单信息 ssh 20240102
     public function actionGetInfoByOrderSn()
     {

app-hd/controllers/PurchaseController.php

@@ -1106,7 +1106,7 @@ class PurchaseController extends BaseController
             }
         } else {
             if (empty($this->shopId)) {
-                util::fail('暂时无法查看采购单。');
+                //util::fail('暂时无法查看采购单。');
             }
             if (empty($info['mainId']) || $info['mainId'] != $this->mainId) {
                 //不能注释，分享付款功能要用，客户没有登录也能付款

common/components/dict.php

@@ -472,6 +472,7 @@ class dict
             77 => ['link' => '', 'name' => '手动减少', 'id' => 77,],
             78 => ['link' => '', 'name' => '系统操作', 'id' => 78,],
             79 => ['link' => '', 'name' => '扫码付款', 'id' => 79,],
+            80 => ['link' => '', 'name' => '扫码退款', 'id' => 80,],
         ],
 
         //用户来源