Merge branch 'master' into after-sale

app-hd/controllers/PurchaseController.php

@@ -684,8 +684,7 @@ class PurchaseController extends BaseController
                             $post['sendCost'] = bcadd($post['sendCost'] ?? 0, $sendCost, 2);
                             $post['sendDistance'] = $sendDistance;
 
-                            noticeUtil::push("自定义运费计算：" . $sendCost . "|" . $post['sendCost'] . " distanceMeters:" . $distanceMeters . " config:" . json_encode($shCurrentConfig), '15280215347');
-
+                            noticeUtil::push("自定义运费计算：" . $sendCost . "|" . $post['sendCost'] . " 数量:{$productCount} 金额:{$shMethodItemAmount}  距离:" . $distanceMeters . " config:" . json_encode($shCurrentConfig), '15280215347');
                         } else {
                             // 使用 DeliveryQuoteUtil 获取配送报价
                             try {
@@ -1222,7 +1221,12 @@ class PurchaseController extends BaseController
                     GhsNotifyClass::newOrderNotify($order->id ?? 0);
                 }
                 if (isset($order->needPrint) && $order->needPrint == dict::getDict('needPrint', 'need')) {
-                    OrderClass::onlinePrint($order);
+                    $printReturn = OrderClass::onlinePrint($order);
+                    $printSn = $printReturn['printSn'] ?? '';
+                    if (!empty($printSn)) {
+                        $order->printNum += 1;
+                        $order->save();
+                    }
                 }
                 GhsDeliveryOrderClass::payAfter($order);
 

biz-ghs/order/classes/OrderClass.php

@@ -2013,7 +2013,12 @@ class OrderClass extends BaseClass
                     $showPrice = 0;
                 }
             }
-
+            //梅州紫荆鲜花，线上下单，不显示价格
+            if (isset($orderInfo->mainId) && $orderInfo->mainId == 92739) {
+                if (!empty($orderInfo->customShopAdminId)) {
+                    $showPrice = 0;
+                }
+            }
             //北京花篮子，线上下单，不显示价格
             if (isset($orderInfo->mainId) && $orderInfo->mainId == 10735) {
                 if (!empty($orderInfo->customShopAdminId)) {
@@ -2071,7 +2076,7 @@ class OrderClass extends BaseClass
             //东莞我要花不要自动打印标准，mainId=2644，已经去掉了
             $map = [65726, 58, 25119, 28500, 1294, 12925, 83694];
         } else {
-            $map = [828,644];
+            $map = [828, 644];
         }
         if (in_array($orderMainId, $map)) {
             self::printLogisticsLabel($orderInfo, $shop, $ext);
@@ -2282,7 +2287,7 @@ class OrderClass extends BaseClass
             ];
             $p->printMsg($content, $shop, $orderSn, $logMeta);
         }
-
+        return ['printSn' => $printSn];
     }
 
     //打印数据 ssh 20210702
@@ -3129,7 +3134,7 @@ XL;
         if (getenv('YII_ENV') == 'production') {
             $map = [65726, 58, 25119, 28500, 1294, 12925, 2644, 10652, 2084, 89473, 83694];
         } else {
-            $map = [828,644];
+            $map = [828, 644];
         }
         /**************************如果是好多花的云仓还要再打一下标签纸，多处要同步修改，关键词 hdh_yc *****************************/
         $customId = $order->customId ?? 0;
@@ -3230,7 +3235,7 @@ XL;
             $addressLen = mb_strlen($fullAddress, 'UTF-8');
             $fontScale = '2';
             $content .= '<TEXT x="290" y="45" font="12" w="' . $fontScale . '" h="' . $fontScale . '" r="90">' . $fullAddress . '</TEXT>';
-            if(!empty($showAddress)){
+            if (!empty($showAddress)) {
                 $content .= '<TEXT x="230" y="45" font="12" w="1" h="2" r="90">' . $showAddress . '</TEXT>';
             }
             $content .= '<TEXT x="140" y="45" font="12" w="2" h="2" r="90">' . $customMobile . '  ' . $itemNum . '扎</TEXT>';

common/components/mapUtil.php

@@ -13,7 +13,7 @@ use yii\helpers\Json;
 class mapUtil
 {
 
-    public static $thirdMapKey = 'd4ab169335937fb56581ba15ea1bd1a1';
+    public static $thirdMapKey = 'da0634bbbe4b9434854158c7d68e3cb8';
 
     public static function suggestion($region, $keyword)
     {