Merge branch 'master' into dev

app-ghs/controllers/OrderController.php

@@ -1005,6 +1005,14 @@ class OrderController extends BaseController
         if (isset($get['customId']) && !empty($get['customId'])) {
             $where['customId'] = $get['customId'];
         }
+        $customDistId = $get['customDistId'] ?? ($get['distId'] ?? 0);
+        if (!empty($customDistId)) {
+            $where['customDistId'] = (int)$customDistId;
+        }
+        $debt = isset($get['debt']) && is_numeric($get['debt']) ? (int)$get['debt'] : -1;
+        if ($debt > -1) {
+            $where['debt'] = $debt;
+        }
         if (isset($get['ids']) && !empty($get['ids'])) {
             $stringIds = $get['ids'];
             $newIds = explode(',', $stringIds);

biz-ghs/order/classes/OrderClass.php

@@ -822,6 +822,8 @@ class OrderClass extends BaseClass
         $mainId = $data['mainId'] ?? 0;
         $ghsId = $data['ghsId'] ?? 0;
         $customId = $data['customId'] ?? 0;
+		$distId = $custom['distId'] ?? 0;
+		$data['customDistId'] = $distId;
         $snData = ['shopId' => $shopId, 'mainId' => $mainId, 'ghsId' => $ghsId, 'customId' => $customId];
         $orderSn = orderSn::getGhsOrderSn($snData);
 
@@ -3045,7 +3047,7 @@ XL;
         /**************************如果是好多花的云仓还要再打一下标签纸，多处要同步修改，关键词 hdh_yc *****************************/
         $orderMainId = $order->mainId;
         if (getenv('YII_ENV') == 'production') {
-            $map = [65726, 58, 25119, 28500, 1294, 12925, 2644,10652,2084];
+            $map = [65726, 58, 25119, 28500, 1294, 12925, 2644,10652,2084,89473];
         } else {
             $map = [828];
         }
@@ -3070,7 +3072,7 @@ XL;
             }
         }
         //东莞我要花 福州福清我要花 手机后四号变星号
-        if (in_array((int)$orderMainId, [25119, 2644,10652,2084], true)) {
+        if (in_array((int)$orderMainId, [25119, 2644,10652,2084,89473], true)) {
             $customMobile = preg_replace('/(.{4})$/u', '****', trim($customMobile));
         }
         $customName = $order->customName ?? '';
@@ -3142,7 +3144,12 @@ XL;
             $payTime = $order->payTime ?? '';
             $payDate = date('m-d H:i', strtotime($payTime));
             $content = '<TEXT x="400" y="30" font="12" w="3" h="3" r="90">' . $customName . '</TEXT>';
-            $content .= '<TEXT x="280" y="30" font="12" w="2" h="2" r="90">' . $fullAddress . '</TEXT>';
+            
+            // 地址超过15个字，字体大小（w和h）变小一级（由 w="2" h="2" 变为 w="1" h="1"）
+            $addressLen = mb_strlen($fullAddress, 'UTF-8');
+            $fontScale = $addressLen > 16 ? '1' : '2';
+            $content .= '<TEXT x="280" y="30" font="12" w="' . $fontScale . '" h="' . $fontScale . '" r="90">' . $fullAddress . '</TEXT>';
+            
             $content .= '<TEXT x="180" y="30" font="12" w="2" h="2" r="90">' . $customMobile . '  ' . $itemNum . '扎</TEXT>';
             $content .= '<TEXT x="86" y="30" font="12" w="2" h="2" r="90">' . $distName . ' ' . $payDate . '</TEXT>';
             /**************************如果是好多花的云仓还要再打一下标签纸，多处要同步修改，关键词 hdh_yc *****************************/