BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix

pull/1121/head
梁宇奇 2025-05-10 00:17:49 +08:00
parent 4b31cb2d2a
commit 4adbc46ffb
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java
View File

@ -385,17 +385,17 @@ public class StoreOrderServiceImpl implements IStoreOrderService {
orderInfo.setExpressTracks(expressTracks); orderInfo.setExpressTracks(expressTracks);
Map<String, ExpressRegionDTO> regionMap = expressService.getRegionMapCache(); Map<String, ExpressRegionDTO> regionMap = expressService.getRegionMapCache();
orderInfo.setDestinationProvinceName(Optional.ofNullable(regionMap.get(orderInfo.getDestinationProvinceCode())) orderInfo.setDestinationProvinceName(Optional.ofNullable(regionMap.get(orderInfo.getDestinationProvinceCode()))
.map(ExpressRegionDTO::getParentRegionName).orElse(null)); .map(ExpressRegionDTO::getRegionName).orElse(null));
orderInfo.setDestinationCityName(Optional.ofNullable(regionMap.get(orderInfo.getDestinationCityCode())) orderInfo.setDestinationCityName(Optional.ofNullable(regionMap.get(orderInfo.getDestinationCityCode()))
.map(ExpressRegionDTO::getParentRegionName).orElse(null)); .map(ExpressRegionDTO::getRegionName).orElse(null));
orderInfo.setDestinationCountyName(Optional.ofNullable(regionMap.get(orderInfo.getDestinationCountyCode())) orderInfo.setDestinationCountyName(Optional.ofNullable(regionMap.get(orderInfo.getDestinationCountyCode()))
.map(ExpressRegionDTO::getParentRegionName).orElse(null)); .map(ExpressRegionDTO::getRegionName).orElse(null));
orderInfo.setOriginProvinceName(Optional.ofNullable(regionMap.get(orderInfo.getOriginProvinceCode())) orderInfo.setOriginProvinceName(Optional.ofNullable(regionMap.get(orderInfo.getOriginProvinceCode()))
.map(ExpressRegionDTO::getParentRegionName).orElse(null)); .map(ExpressRegionDTO::getRegionName).orElse(null));
orderInfo.setOriginCityName(Optional.ofNullable(regionMap.get(orderInfo.getOriginCityCode())) orderInfo.setOriginCityName(Optional.ofNullable(regionMap.get(orderInfo.getOriginCityCode()))
.map(ExpressRegionDTO::getParentRegionName).orElse(null)); .map(ExpressRegionDTO::getRegionName).orElse(null));
orderInfo.setOriginCountyName(Optional.ofNullable(regionMap.get(orderInfo.getOriginCountyCode())) orderInfo.setOriginCountyName(Optional.ofNullable(regionMap.get(orderInfo.getOriginCountyCode()))
.map(ExpressRegionDTO::getParentRegionName).orElse(null)); .map(ExpressRegionDTO::getRegionName).orElse(null));
//商品信息 //商品信息
List<Long> spIds = detailInfos.stream().map(StoreOrderDetailInfoDTO::getStoreProdId).distinct() List<Long> spIds = detailInfos.stream().map(StoreOrderDetailInfoDTO::getStoreProdId).distinct()
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -430,17 +430,17 @@ public class StoreOrderServiceImpl implements IStoreOrderService {
for (StoreOrderPageItemDTO order : list) { for (StoreOrderPageItemDTO order : list) {
//物流信息 //物流信息
order.setDestinationProvinceName(Optional.ofNullable(regionMap.get(order.getDestinationProvinceCode())) order.setDestinationProvinceName(Optional.ofNullable(regionMap.get(order.getDestinationProvinceCode()))
.map(ExpressRegionDTO::getParentRegionName).orElse(null)); .map(ExpressRegionDTO::getRegionName).orElse(null));
order.setDestinationCityName(Optional.ofNullable(regionMap.get(order.getDestinationCityCode())) order.setDestinationCityName(Optional.ofNullable(regionMap.get(order.getDestinationCityCode()))
.map(ExpressRegionDTO::getParentRegionName).orElse(null)); .map(ExpressRegionDTO::getRegionName).orElse(null));
order.setDestinationCountyName(Optional.ofNullable(regionMap.get(order.getDestinationCountyCode())) order.setDestinationCountyName(Optional.ofNullable(regionMap.get(order.getDestinationCountyCode()))
.map(ExpressRegionDTO::getParentRegionName).orElse(null)); .map(ExpressRegionDTO::getRegionName).orElse(null));
order.setOriginProvinceName(Optional.ofNullable(regionMap.get(order.getOriginProvinceCode())) order.setOriginProvinceName(Optional.ofNullable(regionMap.get(order.getOriginProvinceCode()))
.map(ExpressRegionDTO::getParentRegionName).orElse(null)); .map(ExpressRegionDTO::getRegionName).orElse(null));
order.setOriginCityName(Optional.ofNullable(regionMap.get(order.getOriginCityCode())) order.setOriginCityName(Optional.ofNullable(regionMap.get(order.getOriginCityCode()))
.map(ExpressRegionDTO::getParentRegionName).orElse(null)); .map(ExpressRegionDTO::getRegionName).orElse(null));
order.setOriginCountyName(Optional.ofNullable(regionMap.get(order.getOriginCountyCode())) order.setOriginCountyName(Optional.ofNullable(regionMap.get(order.getOriginCountyCode()))
.map(ExpressRegionDTO::getParentRegionName).orElse(null)); .map(ExpressRegionDTO::getRegionName).orElse(null));
order.setOrderDetails(orderDetailGroup.get(order.getId())); order.setOrderDetails(orderDetailGroup.get(order.getId()));
for (StoreOrderDetailInfoDTO detail : order.getOrderDetails()) { for (StoreOrderDetailInfoDTO detail : order.getOrderDetails()) {
//首图 //首图
@ -1436,17 +1436,17 @@ public class StoreOrderServiceImpl implements IStoreOrderService {
//行政区划信息 //行政区划信息
Map<String, ExpressRegionDTO> regionMap = expressService.getRegionMapCache(); Map<String, ExpressRegionDTO> regionMap = expressService.getRegionMapCache();
reqDTO.setDestinationProvinceName(Optional.ofNullable(regionMap.get(order.getDestinationProvinceCode())) reqDTO.setDestinationProvinceName(Optional.ofNullable(regionMap.get(order.getDestinationProvinceCode()))
.map(ExpressRegionDTO::getParentRegionName).orElse(null)); .map(ExpressRegionDTO::getRegionName).orElse(null));
reqDTO.setDestinationCityName(Optional.ofNullable(regionMap.get(order.getDestinationCityCode())) reqDTO.setDestinationCityName(Optional.ofNullable(regionMap.get(order.getDestinationCityCode()))
.map(ExpressRegionDTO::getParentRegionName).orElse(null)); .map(ExpressRegionDTO::getRegionName).orElse(null));
reqDTO.setDestinationCountyName(Optional.ofNullable(regionMap.get(order.getDestinationCountyCode())) reqDTO.setDestinationCountyName(Optional.ofNullable(regionMap.get(order.getDestinationCountyCode()))
.map(ExpressRegionDTO::getParentRegionName).orElse(null)); .map(ExpressRegionDTO::getRegionName).orElse(null));
reqDTO.setOriginProvinceName(Optional.ofNullable(regionMap.get(order.getOriginProvinceCode())) reqDTO.setOriginProvinceName(Optional.ofNullable(regionMap.get(order.getOriginProvinceCode()))
.map(ExpressRegionDTO::getParentRegionName).orElse(null)); .map(ExpressRegionDTO::getRegionName).orElse(null));
reqDTO.setOriginCityName(Optional.ofNullable(regionMap.get(order.getOriginCityCode())) reqDTO.setOriginCityName(Optional.ofNullable(regionMap.get(order.getOriginCityCode()))
.map(ExpressRegionDTO::getParentRegionName).orElse(null)); .map(ExpressRegionDTO::getRegionName).orElse(null));
reqDTO.setOriginCountyName(Optional.ofNullable(regionMap.get(order.getOriginCountyCode())) reqDTO.setOriginCountyName(Optional.ofNullable(regionMap.get(order.getOriginCountyCode()))
.map(ExpressRegionDTO::getParentRegionName).orElse(null)); .map(ExpressRegionDTO::getRegionName).orElse(null));
//货物信息 //货物信息
List<ExpressShipReqDTO.OrderItem> orderItems = CollUtil.emptyIfNull(orderDetails).stream() List<ExpressShipReqDTO.OrderItem> orderItems = CollUtil.emptyIfNull(orderDetails).stream()
.map(o -> ExpressShipReqDTO.OrderItem .map(o -> ExpressShipReqDTO.OrderItem