shish před 2 roky
rodič
revize
5590b8bc75

+ 3 - 3
app-hd/controllers/NoticeController.php

@@ -146,7 +146,7 @@ class NoticeController extends PublicController
                     if (isset($cg->book) && $cg->book == 0) {
                         $ghsShopId = $order->shopId ?? 0;
                         if (getenv('YII_ENV') == 'production') {
-                            $specialList = [10649, 8042, 16454, 21319];
+                            $specialList = [10649, 8042, 16454, 21319,33668];
                         } else {
                             $specialList = [36523];
                         }
@@ -350,12 +350,12 @@ class NoticeController extends PublicController
                 $saleId = $cg->saleId ?? 0;
                 $order = OrderClass::getById($saleId, true);
 
-                //不是预订单,并且采购人没有开批发店,供货商不是源花汇、小明鲜花、淄博花超、云漫梦金鹏,则订单直接完成掉。是预订单,则确认发货时直接完成掉。有多个地方要修改,请搜索关键词zjFinish
+                //不是预订单,并且采购人没有开批发店,供货商不是源花汇、小明鲜花、淄博花超、云漫梦金鹏、镜中花卉,则订单直接完成掉。是预订单,则确认发货时直接完成掉。有多个地方要修改,请搜索关键词zjFinish
                 if (!empty($cg) && !empty($order)) {
                     if (isset($cg->book) && $cg->book == 0) {
                         $ghsShopId = $order->shopId ?? 0;
                         if (getenv('YII_ENV') == 'production') {
-                            $specialList = [10649, 8042, 16454, 21319];
+                            $specialList = [10649, 8042, 16454, 21319,33668];
                         } else {
                             $specialList = [36523];
                         }

+ 1 - 1
app-hd/controllers/PurchaseController.php

@@ -582,7 +582,7 @@ class PurchaseController extends BaseController
                 if (isset($cg->book) && $cg->book == 0) {
                     $ghsShopId = $ghs['shopId'] ?? 0;
                     if (getenv('YII_ENV') == 'production') {
-                        $specialList = [10649, 8042, 16454, 21319];
+                        $specialList = [10649, 8042, 16454, 21319,33668];
                     } else {
                         $specialList = [36523];
                     }

+ 2 - 2
biz-ghs/order/services/OrderService.php

@@ -134,7 +134,7 @@ class OrderService extends BaseService
         if (!empty($cg) && !empty($order)) {
             $ghsShopId = $order->shopId ?? 0;
             if (getenv('YII_ENV') == 'production') {
-                $specialList = [10649, 8042, 16454, 21319];
+                $specialList = [10649, 8042, 16454, 21319,33668];
             } else {
                 $specialList = [36523];
             }
@@ -314,7 +314,7 @@ class OrderService extends BaseService
             if (isset($returnOrder->book) && $returnOrder->book == 0) {
                 $ghsShopId = $ghs['shopId'] ?? 0;
                 if (getenv('YII_ENV') == 'production') {
-                    $specialList = [10649, 8042, 16454, 21319];
+                    $specialList = [10649, 8042, 16454, 21319,33668];
                 } else {
                     $specialList = [36523];
                 }