Commit 73066888 authored by Smile's avatar Smile

bug320web/app当控货订单是分批放货时才需弹出截图中的提示

parent 4971096c
......@@ -3858,10 +3858,10 @@ public class OrderQueryServiceImpl implements OrderQueryService {
if (Objects.isNull(dto)){
return success(false);
}
// 判断发货人是否是当前登录人
// 判断发货人是否是当前登录人 2025-03-17新增手机号或判断,因为也能根据手机号查询出来订单
Long customerContactsId = dto.getConsignorVO().getCustomerContactsId();
CustomerContactsDO customerContactsDO = customerContactsService.getById(customerContactsId);
if (Objects.equals(customerContactsDO.getUserid(),user.getId())){
if (Objects.equals(customerContactsDO.getUserid(),user.getId())||Objects.equals(customerContactsDO.getPhoneNew(),user.getMobile())){
return success(true);
}
Long customerContactsId1 = dto.getConsigneeVO().getCustomerContactsId();
......@@ -3881,7 +3881,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
}
}
isFirstAllAllow = (count == 1); // 最终判断是否严格等于1
if (dto.getSumNum()==dto.getReleaseNum()&&dto.getCargoControlStatus()==1&&isFirstAllAllow&& msg.contains(String.valueOf(customerContactsDO1.getPhoneNew())) && customerContactsDO1.getUserid().equals(user.getId())){
if (dto.getSumNum()==dto.getReleaseNum()&&dto.getCargoControlStatus()==1&&isFirstAllAllow&& msg.contains(String.valueOf(customerContactsDO1.getPhoneNew())) && (customerContactsDO1.getUserid().equals(user.getId())||customerContactsDO1.getPhoneNew().equals(user.getMobile()))){
return success(true);
}
return success(false);
......
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