Merge branch 'master' into dev

app-ghs/controllers/MainController.php

@@ -240,7 +240,7 @@ class MainController extends BaseController
         $smallShopImg = $shopImg . "?x-oss-process=image/resize,m_fill,h_180,w_180";
 
         //是否显示推荐广告
-        $showAd = 0;
+        $showAd = 1;
         //用于审核的账号不要显示广告
         if ($this->mainId == 58) {
             $showAd = 0;

app-ghs/controllers/TestController.php

@@ -467,7 +467,11 @@ class TestController extends BaseController
             //['name' => '昆明木鱼花草堂', 'merchantNo' => '8227310599200ZU', 'wx' => [874780341, 874779360], 'zfb' => '2088480009915486'],
             //['name' => '永城花鲜谷鲜花批发', 'merchantNo' => '82250605992008V', 'wx' => [874955479, 874955569], 'zfb' => '2088480025639193'],
             //['name' => '任丘蓝色雨鲜花批发', 'merchantNo' => '82214305992007M', 'wx' => [875610544, 875611929], 'zfb' => '2088480065124374'],
-            ['name' => '云南熙朵花卉', 'merchantNo' => '82273105992010C', 'wx' => [876755672, 876755475], 'zfb' => '2088480109605151'],
+            //['name' => '云南熙朵花卉', 'merchantNo' => '82273105992010C', 'wx' => [876755672, 876755475], 'zfb' => '2088480109605151'],
+            //['name' => '宿州温馨鲜花批发', 'merchantNo' => '82237405992003T', 'wx' => [880834087, 880834521], 'zfb' => '2088480300332087'],
+            //['name' => '济南万花田', 'merchantNo' => '8224510599200NN', 'wx' => [881205017, 881205264], 'zfb' => '2088480339301423'],
+            //['name' => '济南万花田鲜花', 'merchantNo' => '8224510599200NP', 'wx' => [881375592, 881375991], 'zfb' => '2088480345092520'],
+            ['name' => '温州易批花', 'merchantNo' => '8223330599200E0', 'wx' => [882196314, 882196905], 'zfb' => '2088480379232415'],
             //['name' => '藏花林', 'merchantNo' => '8227310599200ZC', 'wx' => [868558224, 868558410], 'zfb' => '2088380587657250'],
             //['name' => '昆明藏花林花卉', 'merchantNo' => '8227310599200ZN', 'wx' => [869670880, 869668881], 'zfb' => '2088380691198135'],
             //['name' => '昆明藏花林鲜花', 'merchantNo' => '8227310599200ZJ', 'wx' => [869361939, 869362520], 'zfb' => '2088380669365761'],
@@ -988,7 +992,7 @@ class TestController extends BaseController
     //交易查询 ssh 20231021
     public function actionTradeQuery()
     {
-        $shopId = 7855;
+        $shopId = 86726;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
             util::stop('没有找到门店，编号677230');
@@ -1004,13 +1008,13 @@ class TestController extends BaseController
             'lklCertificatePath' => $lklCertificatePath,
         ];
         $laResource = new Lakala($params);
-        $orderSn = 'CG30574681';
+        $orderSn = 'CG30692793';
         $tradeNo = '66223936904050';
         $queryParams = [
             'orderSn' => $orderSn,
             'tradeNo' => $tradeNo,
         ];
-        $response = $laResource->query($queryParams, 1);
+        $response = $laResource->query($queryParams, 0);
         echo "<pre>";
         print_r($response);
         util::stop();

app-hd/controllers/PurchaseController.php

@@ -657,7 +657,7 @@ class PurchaseController extends BaseController
 
                     //广州鑫源花卉，选择送货上门必须选必选商品
                     if ($ghsShopId == 12439) {
-                        $hasMust = array_intersect($ids, [3446945, 3446970, 3446973, 3446979, 3446995, 3447010, 3447023, 3459983]);
+                        $hasMust = array_intersect($ids, [3446945, 3446970, 3446973, 3446979, 3446995, 3447010, 3447023, 3459983, 4333184, 4317745, 1585738]);
                         if (empty($hasMust)) {
                             util::fail('请返回选择 必选商品');
                         }

biz-ghs/order/classes/OrderClass.php

@@ -1899,7 +1899,7 @@ class OrderClass extends BaseClass
         /**************************如果是好多花的云仓还要再打一下标签纸，多处要同步修改，关键词 hdh_yc *****************************/
         $orderMainId = $orderInfo['mainId'] ?? 0;
         if (getenv('YII_ENV') == 'production') {
-            $map = [65726, 58, 25119];
+            $map = [65726, 58, 25119,28500];
         } else {
             $map = [828];
         }
@@ -2958,7 +2958,7 @@ XL;
         /**************************如果是好多花的云仓还要再打一下标签纸，多处要同步修改，关键词 hdh_yc *****************************/
         $orderMainId = $order->mainId;
         if (getenv('YII_ENV') == 'production') {
-            $map = [65726, 58, 25119];
+            $map = [65726, 58, 25119,28500];
         } else {
             $map = [828];
         }
@@ -3057,7 +3057,7 @@ XL;
             $content .= '<TEXT x="195" y="30" font="12" w="1" h="2" r="90">' . $fullAddress . '</TEXT>';
             $content .= '<TEXT x="128" y="30" font="12" w="2" h="2" r="90">' . $customMobile . ' ' . $itemNum . '扎</TEXT>';
             //福州易批花，不仅要自动打印，还要打印出物流名称
-            if ($orderMainId == 25119) {
+            if ($orderMainId == 25119 || $orderMainId == 28500) {
                 $content .= '<TEXT x="70" y="30" font="12" w="2" h="2" r="90">物流 ' . $wlName .' '.$payDate. '</TEXT>';
             }
             /**************************如果是好多花的云仓还要再打一下标签纸，多处要同步修改，关键词 hdh_yc *****************************/

biz-hd/order/services/OrderService.php

@@ -114,6 +114,11 @@ class OrderService extends BaseService
             $currentId = $val['productId'] ?? 0;
             $num = $val['num'] ?? 0;
 
+			//修改订单会出现数量为0的情况
+            if ($num <= 0) {
+                continue;
+            }
+
             $currentPrice = bcmul($unitPrice, $num, 2);
             $goodsPrice = bcadd($goodsPrice, $currentPrice, 2);
 

biz/ghs/classes/GhsClass.php

@@ -348,7 +348,7 @@ class GhsClass extends BaseClass
         }
 
         //要排除的批发店
-        $exclude = [64112, 62304, 42385, 56611, 38143, 15373, 42946, 15375, 15734, 15736, 15738, 15740, 24132, 29044, 29161, 30902, 44724, 48608, 48642, 82971, 38231, 1105, 3, 154, 208, 23580, 24713, 8249, 16070, 83690, 86726, 1596, 2167];
+        $exclude = [64112, 62304, 42385, 56611, 38143, 15373, 42946, 15375, 15734, 15736, 15738, 15740, 24132, 29044, 29161, 30902, 44724, 48608, 48642, 82971, 38231, 1105, 3, 154, 208, 23580, 24713, 8249, 16070, 83690, 86726, 1596, 2167, 15007, 88085, 91064, 413];
         foreach ($nearbyShops as $key => $nearbyShop) {
             if (in_array($nearbyShop['id'], $exclude)) {
                 unset($nearbyShops[$key]);