Skip to content

J
jiedao-api-boot-master
Commit 62c326ed authored by honghy's avatar honghy Committed by wux
Browse files
Options

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

parent c77db7d9
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @ 62c326ed
......@@ -2766,7 +2766,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(), consigneeContactsDO.getId())) {
if (!Objects.equals(orderConsigneeBackVO.getCustomerContactsId(), consigneeContactsDO.getId())||(Objects.equals(orderConsigneeBackVO.getCustomerContactsId(), consigneeContactsDO.getId())
&& !StringUtils.equals(orderConsigneeBackVO.getPhone(), consigneeContactsDO.getPhoneNew()))) {
// 收货人电话
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