|
|
@@ -378,16 +378,16 @@ class OrderClass extends BaseClass
|
|
|
if (empty($customShop)) {
|
|
|
util::fail('没有找到客户的门店');
|
|
|
}
|
|
|
- if (isset($customShop->pfShopId) && !empty($customShop->pfShopId)) {
|
|
|
+ if (!empty($customShop->pfShopId)) {
|
|
|
//如果客户是勇记花卉 森润 国恋 珊瑚 中华 寻花季 还是要直接完成，请搜索关键词 has_pf_direct_finish
|
|
|
if (getenv('YII_ENV') == 'production') {
|
|
|
$particularIds = [7779, 7832, 10610, 7779, 16780, 716, 8394];
|
|
|
} else {
|
|
|
$particularIds = [36750];
|
|
|
}
|
|
|
- if (!in_array($customShop->id, $particularIds)) {
|
|
|
- util::fail('客户有批发店，请通知对方确认');
|
|
|
- }
|
|
|
+// if (!in_array($customShop->id, $particularIds)) {
|
|
|
+// util::fail('客户有批发店，请通知对方确认');
|
|
|
+// }
|
|
|
}
|
|
|
//订单如果没有发货则先发货
|
|
|
if ($order->status == 2) {
|
