Commit 389ced54 authored by honghy's avatar honghy Committed by wux

bug317 对已入仓的订单去编辑修改收货人号码时,未触发订单修改审批流程

parent 62c326ed
......@@ -2679,7 +2679,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
applyInfoList.add(infoVO);
}
// 发货人信息
if (!Objects.equals(orderConsignorBackVO.getCustomerContactsId(), consignorContactsDO.getId())) {
if (!Objects.equals(orderConsignorBackVO.getCustomerContactsId(), consignorContactsDO.getId())||(Objects.equals(orderConsignorBackVO.getCustomerContactsId(), consignorContactsDO.getId())
&& !StringUtils.equals(orderConsignorBackVO.getPhone(), consignorContactsDO.getPhoneNew()))) {
// 发货人电话
if (!StringUtils.equals(orderConsignorBackVO.getPhone(), consignorContactsDO.getPhoneNew()) || !StringUtils.equals(orderConsignorBackVO.getCountryCode(), consignorContactsDO.getAreaCode())) {
infoVO = new ApplyInfoVO();
......
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