花掌柜漏改 和 订单号前缀修改

app-hd/controllers/DeliveryController.php

@@ -96,8 +96,8 @@ class DeliveryController extends BaseController
             util::fail('获取custom数据失败');
         }
 
-        // 生成随机订单号
-        $prefix = 'XSD_CS-' . $ghs->mainId . '-';
+        // 生成随机订单号，不要跟原来的混起来，跑腿-销售单-
+        $prefix = 'PT-XSD-' . $ghs->mainId . '-';
         $orderSn = $prefix . round(microtime(true) * 1000);
 
         //构建出 Order 数据

app-hd/controllers/PurchaseController.php

@@ -575,15 +575,15 @@ class PurchaseController extends BaseController
                 //同城发货包装费和运费的计算
                 $sendCost = 0;
                 $sendDistance = 0;
-
-                $mapSet = ShopClass::hasIntraCity($this->shop);
+                //特别注意，这边取供货商的shop信息
+                $mapSet = ShopClass::hasIntraCity($ghsShopInfo);
                 $openIntraCity = $mapSet['openIntraCity'] ?? 0;
                 if ($sendType == dict::getDict('sendType', 'thirdSend')) {
                     if ($openIntraCity == 2) {
                         util::fail('不能使用跑腿');
                     }
                     if ($openIntraCity == 1) {
-                        // 生成随机订单号
+                        // 生成随机订单号，不要跟原来的混起来，跑腿-销售单-
                         $prefix = 'PT-XSD-' . $this->mainId . '-';
                         $orderSn = $prefix . round(microtime(true) * 1000);
 

app-mall/controllers/DeliveryController.php

@@ -52,8 +52,8 @@ class DeliveryController extends BaseController
 
     private function generateOrderData($buyType, $user, $post)
     {
-        // 生成随机订单号
-        $prefix = 'XSD_CS-' . $this->mainId . '-';
+        // 生成随机订单号，不要跟原来的混起来，跑腿-销售单-
+        $prefix = 'PT-XSD-' . $this->mainId . '-';
         $orderSn = $prefix . round(microtime(true) * 1000);
 
         //构建出 Order 数据

app-mall/controllers/OrderController.php

@@ -377,8 +377,8 @@ class OrderController extends BaseController
 
                 $distance = 0;
                 $sendCost = 0;
-
-                $prefix = 'XSD_CS-' . $this->mainId . '-';
+                //生成随机订单号，不要跟原来的混起来，跑腿-销售单-
+                $prefix = 'PT-XSD-' . $this->mainId . '-';
                 $orderSn = $prefix . round(microtime(true) * 1000);
                 $ghsInfo = ['mainId' => $this->mainId, 'shopId' => $this->shopId];
 

common/components/delivery/util/DeliveryQuoteUtil_USAGE.md

@@ -77,8 +77,8 @@ try {
 ### 示例 1：在 PurchaseController 中使用
 
 ```php
-// 生成订单号
-$prefix = 'XSD_CS-' . $this->mainId . '-';
+// 生成随机订单号，不要跟原来的混起来，跑腿-销售单-
+$prefix = 'PT-XSD-' . $this->mainId . '-';
 $orderSn = $prefix . round(microtime(true) * 1000);
 
 // 获取配送报价