|
|
@@ -1090,6 +1090,12 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
|
|
|
@Override
|
|
|
public void createOmsOrder(Long orderId) throws ParseException {
|
|
|
LiveOrder order = baseMapper.selectLiveOrderByOrderId(String.valueOf(orderId));
|
|
|
+ if(ObjectUtil.equal(order.getCompanyId(),-1L)) {
|
|
|
+ order.setCompanyId(null);
|
|
|
+ }
|
|
|
+ if(ObjectUtil.equal(order.getCompanyUserId(),-1L)) {
|
|
|
+ order.setCompanyUserId(null);
|
|
|
+ }
|
|
|
|
|
|
if(StringUtils.isEmpty(order.getExtendOrderId())&&order.getStatus()!=2){
|
|
|
return;
|
|
|
@@ -1122,12 +1128,6 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
|
|
|
//3.新疆 西藏 内蒙古 海南 全款订单走顺丰丰云配 【非全款】的就根据公司配置那来 配的哪个走哪个快递
|
|
|
//4.把现在发中通的规则改成发顺丰风云配 CQRXSF.0235487868_241231
|
|
|
//5.全款支付且应付金额小于等于100元，快递方式默认中通小件455 ZTO 中通小件 CQRXSF.0235487868_241231
|
|
|
- if(ObjectUtil.equal(order.getCompanyId(),-1L)) {
|
|
|
- order.setCompanyId(null);
|
|
|
- }
|
|
|
- if(ObjectUtil.equal(order.getCompanyUserId(),-1L)) {
|
|
|
- order.setCompanyUserId(null);
|
|
|
- }
|
|
|
|
|
|
if(order.getCompanyId()!=null&&order.getStoreHouseCode()!=null&&order.getStoreHouseCode().equals("WHSP001")){
|
|
|
//杭州家有仙妻实业有限公司 全部订单快递方式设置为商城德邦快递
|
