|
|
@@ -119,6 +119,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
order.setOrgOrderNo((String) clientBillNo.getData());
|
|
|
}
|
|
|
}
|
|
|
+ //主订单号为空已订单号一致国内贸易
|
|
|
+ if (StringUtils.isBlank(order.getMorderNo()) && order.getTradeType().equals(OrderTypeEnum.DOMESTIC.getType())){
|
|
|
+ order.setMorderNo(order.getOrderNo());
|
|
|
+ }
|
|
|
order.setTenantId(SecureUtil.getTenantId());
|
|
|
order.setCreateTime(date);
|
|
|
order.setCreateUser(SecureUtil.getUserId());
|