Commit 4cb58194 authored by honghy's avatar honghy

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

parent 5a374142
......@@ -2679,7 +2679,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
applyInfoList.add(infoVO);
}
// 发货人信息
if (!Objects.equals(orderConsignorBackVO.getCustomerContactsId(), updateReqVO.getConsignorContactsId())) {
if (!Objects.equals(orderConsignorBackVO.getCustomerContactsId(), updateReqVO.getConsignorContactsId())||
(!StringUtils.equals(orderConsignorBackVO.getPhone(), updateReqVO.getConsignorPhone()))) {
// 发货人电话
if (!StringUtils.equals(orderConsignorBackVO.getPhone(), consignorContactsDO.getPhoneNew()) || !StringUtils.equals(orderConsignorBackVO.getCountryCode(), consignorContactsDO.getAreaCode())) {
infoVO = new ApplyInfoVO();
......@@ -2766,7 +2767,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
orderConsigneeBackVO.setEmail(StringUtils.isNotBlank(updateReqVO.getConsigneeEmail()) ? updateReqVO.getConsigneeEmail() : "");
applyInfoList.add(infoVO);
}
if (!Objects.equals(orderConsigneeBackVO.getCustomerContactsId(), updateReqVO.getConsigneeContactsId())) {
if (!Objects.equals(orderConsigneeBackVO.getCustomerContactsId(), updateReqVO.getConsigneeContactsId())||
(!StringUtils.equals(orderConsigneeBackVO.getPhone(), updateReqVO.getConsigneePhone()))) {
// 收货人电话
if (!StringUtils.equals(orderConsigneeBackVO.getPhone(), consigneeContactsDO.getPhoneNew()) || !StringUtils.equals(orderConsigneeBackVO.getCountryCode(), consigneeContactsDO.getAreaCode())) {
if (updateReqVO.getHasConsignee() && StringUtils.isNotBlank(consigneeContactsDO.getAreaCode()) &&
......
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