Merge branch 'master' into zhongqi-lakala-jingjian

app-ghs/controllers/TestController.php

@@ -505,7 +505,7 @@ class TestController extends BaseController
             //['name' => '广州福隆花卉', 'merchantNo' => '8225810599201T8', 'wx' => [900532403, 900531348], 'zfb' => '2088780172288658'],
             //['name' => '张家口万花汇', 'merchantNo' => '82213805992008D', 'wx' => [901551070, 901551037], 'zfb' => '2088780253600870'],
             //['name' => '深圳每日鲜花批发', 'merchantNo' => '82258405992020E', 'wx' => [902309136, 902307468], 'zfb' => '2088780298610704'],
-            ['name' => '山东省花镜鲜花批发', 'merchantNo' => '82246605992005T', 'wx' => [904309313, 904308445], 'zfb' => '2088780420135491'],
+            ['name' => '滨州花镜鲜花', 'merchantNo' => '82246605992005U', 'wx' => [904373612, 904373338], 'zfb' => '2088780426621723'],
             //['name' => '厦门纯彩花艺', 'merchantNo' => '8223930599200LD', 'wx' => [894984230, 894983290], 'zfb' => '2088680439152343'],
             //['name' => '东莞我要花鲜花', 'merchantNo' => '8226020599200R8', 'wx' => [894794554, 894794917], 'zfb' => '2088680405463378'],
             //['name' => '镇江花珩鲜花批发', 'merchantNo' => '82231405992003N', 'wx' => [894925711, 894925626], 'zfb' => '2088680426877183'],

biz-ghs/order/classes/OrderClass.php

@@ -1949,6 +1949,11 @@ class OrderClass extends BaseClass
                 $showPrice = 0;
             }
 
+            //义乌我要花 不带价格
+            if (isset($orderInfo->mainId) && $orderInfo->mainId == 83694) {
+                $showPrice = 0;
+            }
+
             //衡阳昕得鲜花批发，线上下单，不显示价格
             if (isset($orderInfo->mainId) && $orderInfo->mainId == 85744) {
                 if (!empty($orderInfo->customShopAdminId)) {
@@ -3074,7 +3079,7 @@ XL;
         /**************************如果是好多花的云仓还要再打一下标签纸，多处要同步修改，关键词 hdh_yc *****************************/
         $orderMainId = $order->mainId;
         if (getenv('YII_ENV') == 'production') {
-            $map = [65726, 58, 25119, 28500, 1294, 12925, 2644, 10652, 2084, 89473];
+            $map = [65726, 58, 25119, 28500, 1294, 12925, 2644, 10652, 2084, 89473,83694];
         } else {
             $map = [828];
         }
@@ -3099,7 +3104,7 @@ XL;
             }
         }
         //东莞我要花 手机后四号变星号
-        if (in_array((int)$orderMainId, [2644, 10652, 2084, 89473], true)) {
+        if (in_array((int)$orderMainId, [2644, 10652, 89473], true)) {
             $customMobile = preg_replace('/(.{4})$/u', '****', trim($customMobile));
         }
         $customName = $order->customName ?? '';