Commit 4970ec4a authored by zhengyi's avatar zhengyi

当订单从控货改非控货,无收货人改有收货人时,bug修复

parent de8c5444
...@@ -2061,10 +2061,13 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -2061,10 +2061,13 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (Objects.nonNull(consigneeDO)) { if (Objects.nonNull(consigneeDO)) {
if (Objects.isNull(orderConsigneeBackVO)){ if (Objects.isNull(orderConsigneeBackVO)){
orderConsigneeBackVO = new OrderConsigneeBackVO(); orderConsigneeBackVO = new OrderConsigneeBackVO();
// 会走这里,说明订单从无收货人改为有收货人
orderConsigneeBackVO.setIsCharge(true);
} }
orderConsigneeBackVO.setCustomerNumber(consigneeDO.getNumber()); orderConsigneeBackVO.setCustomerNumber(consigneeDO.getNumber());
} }
if (vo.getIsCargoControl() && hasConsignee) { // if (vo.getIsCargoControl() && hasConsignee) {
if (hasConsignee) {
if (Objects.isNull(consigneeContactsDO)) { if (Objects.isNull(consigneeContactsDO)) {
//todo 需要判断手机号唯一性,判断规则:1.区号相同,2.先判断手机号码是否存在,然后再判断:a.如果是0开头,判断是否存在非0开头号码;b.如果非0开头,判断是否存在0开头号码 //todo 需要判断手机号唯一性,判断规则:1.区号相同,2.先判断手机号码是否存在,然后再判断:a.如果是0开头,判断是否存在非0开头号码;b.如果非0开头,判断是否存在0开头号码
// consigneeDO = customerService.getById(updateReqVO.getConsignorId()); // consigneeDO = customerService.getById(updateReqVO.getConsignorId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment