|
@@ -448,9 +448,9 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
//判断当前是否满足推送条件(erp订单号不为空且订单状态为待发货时可推送)
|
|
//判断当前是否满足推送条件(erp订单号不为空且订单状态为待发货时可推送)
|
|
|
- if (!(StringUtils.isNotBlank(dbOrder.getExtendOrderId()) && ObjectUtil.equal(dbOrder.getStatus(),1))) {
|
|
|
|
|
|
|
+ if (StringUtils.isBlank(dbOrder.getExtendOrderId())) {
|
|
|
log.info("不满足修改订单地址推送到ERP条件: extendOrderId={}, status={}", dbOrder.getExtendOrderId(), dbOrder.getStatus());
|
|
log.info("不满足修改订单地址推送到ERP条件: extendOrderId={}, status={}", dbOrder.getExtendOrderId(), dbOrder.getStatus());
|
|
|
- throw new RuntimeException("只支持待发货修改地址!");
|
|
|
|
|
|
|
+ throw new RuntimeException("不满足修改订单地址推送到ERP条件!");
|
|
|
}
|
|
}
|
|
|
// 3. 构造用于ERP推送的订单对象:订单地址用传入的新值
|
|
// 3. 构造用于ERP推送的订单对象:订单地址用传入的新值
|
|
|
if (StrUtil.isBlank(partialOrder.getUserAddress())){
|
|
if (StrUtil.isBlank(partialOrder.getUserAddress())){
|