Merge branch 'mt' of git.huaml.com:zhh/huahuibao into mt

biz-hd/goods/classes/GoodsClass.php

@@ -594,6 +594,7 @@ class GoodsClass extends BaseClass
             $remark = $params['remark'] ?? '';
             $orderDebtPrice = $params['orderDebtPrice'] ?? 0;
             $sendType = $params['sendType'] ?? 0;
+            $thirdSn = $params['thirdSn'] ?? '';
             $hasReachTime = 0;
             $reachPeriod = 0;
             $reachDate = '0000-00-00';
@@ -631,6 +632,7 @@ class GoodsClass extends BaseClass
                 'fromType' => $fromType,
                 'sendType' => $sendType,
                 'remark' => $remark,
+                'thirdSn' => $thirdSn,
             ];
             $main = MainClass::getById($mainId, true);
             if (empty($main)) {

biz-hd/order/classes/OrderClass.php

@@ -433,19 +433,23 @@ class OrderClass extends BaseClass
         $customId = $order->customId ?? 0;
         $custom = CustomClass::getById($customId);
         $debtAmount = $custom['debtAmount'] ?? 0;
+        $respond = self::getPrintData($order, $debtAmount);
 
         $fromType = $order->fromType ?? dict::getDict('fromType', 'shop');
         $fromTypeMap = dict::getDict('fromTypeMap');
         $fromTypeName = $fromTypeMap[$fromType] ?? '门店';
-        //如果是微信下的单则显示哪个客服和客户名称
+        //客服下的单则显示客服号和客户名称
         if ($fromType == dict::getDict('fromType', 'friend')) {
             $staffName = $order->shopAdminName ?? '';
             $bookName = $order->bookName ?? '';
             $fromTypeName = $staffName . ' ' . $bookName;
         }
 
-        $respond = self::getPrintData($order, $debtAmount);
-        $content = '<B>' . $respond['sendNum'] . ' ' . $fromTypeName . '</B><BR>';
+        if ($fromType == dict::getDict('fromType', 'mt')) {
+            $content = '<B>美团编号 ' . $order->thirdSn . '</B><BR>';
+        } else {
+            $content = '<B>' . $respond['sendNum'] . ' ' . $fromTypeName . '</B><BR>';
+        }
         $content .= '--------------------------------<BR>';
 
         $readPeriod = $order->reachPeriod ?? 0;

biz-hd/work/classes/WorkClass.php

@@ -120,6 +120,7 @@ class WorkClass extends BaseClass
         $orderDebtPrice = $data['orderDebtPrice'] ?? 0;
         $sendType = $data['sendType'] ?? 0;
         $fromType = $data['fromType'] ?? 1;
+        $thirdSn = $data['thirdSn'] ?? '';
 
         $ids = array_column($goods, 'productId');
         $info = GoodsClass::getByIds($ids, null, 'id');
@@ -183,6 +184,7 @@ class WorkClass extends BaseClass
                 'orderDebtPrice' => $orderDebtPrice,
                 'fromType' => $fromType,
                 'sendType' => $sendType,
+                'thirdSn' => $thirdSn,
             ];
             self::createFinish($current, $main);
         }

biz-mall/order/classes/OrderGoodsClass.php

@@ -34,7 +34,8 @@ class OrderGoodsClass extends BaseClass
                 $remark = $order->remark ?? '';
                 $orderDebtPrice = $order->remainDebtPrice ?? 0;
                 $sendType = $order->sendType ?? 0;
-                $params = ['orderId' => $orderId, 'orderSn' => $orderSn, 'shopId' => $shopId, 'sendType' => $sendType,
+                $thirdSn = $order->thirdSn ?? '';
+                $params = ['orderId' => $orderId, 'orderSn' => $orderSn, 'shopId' => $shopId, 'sendType' => $sendType, 'thirdSn' => $thirdSn,
                     'fromType' => $fromType, 'orderPrice' => $orderPrice, 'remark' => $remark, 'orderDebtPrice' => $orderDebtPrice];
                 $flower = $goods->flower ?? 0;
                 //鲜花类不需要验证库存，库存可以负数，并相应生成制作单