Skip to content

J
jiedao-api-boot-master
Commit 51d91905 authored by honghy's avatar honghy
Browse files
Options

bug203 报价单校验错误

parent 1c77be18
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/service/offer/impl/OfferServiceImpl.java
View file @ 51d91905
...@@ -193,7 +193,8 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl ...@@ -193,7 +193,8 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
// 智慧预装功能开关 // 智慧预装功能开关
DictDataRespDTO dictDataRespDTO = dictList.stream().filter(dto -> "create_order_phone_limit".equals(dto.getLabel())).findFirst().orElse(null); DictDataRespDTO dictDataRespDTO = dictList.stream().filter(dto -> "create_order_phone_limit".equals(dto.getLabel())).findFirst().orElse(null);
CustomerContactsDO consigneeContactsDO = customerContactsService.getCustomerContacts(createReqVO.getConsigneeId()); CustomerContactsDO consigneeContactsDO = customerContactsService.getCustomerContacts(createReqVO.getConsigneeId());
if (Objects.nonNull(consigneeContactsDO)) { // 2025-01-17 归属人为收件人才检测
if (Objects.nonNull(consigneeContactsDO)&&createReqVO.getRelation() == 2) {
if (Objects.nonNull(dictDataRespDTO) && StringUtils.equals(dictDataRespDTO.getValue(), "11") && StringUtils.isNotBlank(consigneeContactsDO.getAreaCode()) && StringUtils.equals("86", consigneeContactsDO.getAreaCode())) { if (Objects.nonNull(dictDataRespDTO) && StringUtils.equals(dictDataRespDTO.getValue(), "11") && StringUtils.isNotBlank(consigneeContactsDO.getAreaCode()) && StringUtils.equals("86", consigneeContactsDO.getAreaCode())) {
throw exception(CONSIGNEE_PHONE_IS_EXTERNAL); throw exception(CONSIGNEE_PHONE_IS_EXTERNAL);
} }
...@@ -519,7 +520,7 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl ...@@ -519,7 +520,7 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
// 智慧预装功能开关 // 智慧预装功能开关
DictDataRespDTO dictDataRespDTO = dictList.stream().filter(dto -> "create_order_phone_limit".equals(dto.getLabel())).findFirst().orElse(null); DictDataRespDTO dictDataRespDTO = dictList.stream().filter(dto -> "create_order_phone_limit".equals(dto.getLabel())).findFirst().orElse(null);
CustomerContactsDO consigneeContactsDO = customerContactsService.getCustomerContacts(updateReqVO.getConsigneeId()); CustomerContactsDO consigneeContactsDO = customerContactsService.getCustomerContacts(updateReqVO.getConsigneeId());
if (Objects.nonNull(consigneeContactsDO)) { if (Objects.nonNull(consigneeContactsDO)&&updateReqVO.getRelation() == 2) {
if (Objects.nonNull(dictDataRespDTO) && StringUtils.equals(dictDataRespDTO.getValue(), "11") && StringUtils.isNotBlank(consigneeContactsDO.getAreaCode()) && StringUtils.equals("86", consigneeContactsDO.getAreaCode())) { if (Objects.nonNull(dictDataRespDTO) && StringUtils.equals(dictDataRespDTO.getValue(), "11") && StringUtils.isNotBlank(consigneeContactsDO.getAreaCode()) && StringUtils.equals("86", consigneeContactsDO.getAreaCode())) {
throw exception(CONSIGNEE_PHONE_IS_EXTERNAL); throw exception(CONSIGNEE_PHONE_IS_EXTERNAL);
} }
......
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