|
@@ -834,9 +834,16 @@ class OrderController extends Controller
|
834
|
834
|
$today_date = date('Y-m-d');
|
835
|
835
|
//是否同步卖家
|
836
|
836
|
$mjFlag = 0;
|
|
837
|
+ //是否取消卖家
|
|
838
|
+ $delFlag = 0;
|
837
|
839
|
if($order['warehouse'] == 3 && $old_order->status >= 2 ){
|
838
|
840
|
if($old_order->orderCode>0){
|
839
|
841
|
$mjFlag = 2; //订单已存在卖家云,更新同步到卖家云
|
|
842
|
+ //判断是否到预发货时间
|
|
843
|
+ if($order['delivery_date']>$today_date){
|
|
844
|
+ //未到发货时间,取消卖家云订单
|
|
845
|
+ $delFlag = 1;
|
|
846
|
+ }
|
840
|
847
|
}
|
841
|
848
|
if( $old_order->warehouse != 3 && $order['delivery_date']<=$today_date){
|
842
|
849
|
//订单其他仓变c仓同步到卖家云
|
|
@@ -876,8 +883,7 @@ class OrderController extends Controller
|
876
|
883
|
$orderSkus['modifyTime'] = $old_order->modifyTime;
|
877
|
884
|
|
878
|
885
|
}
|
879
|
|
- //是否取消卖家
|
880
|
|
- $delFlag = 0;
|
|
886
|
+
|
881
|
887
|
if($order['warehouse'] != 3 && $old_order->status >= 2 && $old_order->warehouse == 3){
|
882
|
888
|
//同步卖家云
|
883
|
889
|
$delFlag = 1;
|