|
|
@@ -142,12 +142,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, 33668];
|
|
|
+ $specialList = [10649, 8042, 16454, 21319, 33668,42345];
|
|
|
} else {
|
|
|
$specialList = [36523];
|
|
|
}
|
|
|
@@ -371,12 +371,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, 33668];
|
|
|
+ $specialList = [10649, 8042, 16454, 21319, 33668,42345];
|
|
|
} else {
|
|
|
$specialList = [36523];
|
|
|
}
|