2024-06-17提交

yudao-module-ecw/yudao-module-ecw-impl/src/main/java/cn/iocoder/yudao/module/ecw/controller/admin/region/RegionController.java

@@ -140,7 +140,7 @@ public class RegionController {
 
     @GetMapping("/getListTree")
     @ApiOperation("获得区域设置列表")
-//    @PreAuthorize("@ss.hasPermission('ecw:region:query')")
+    //@PreAuthorize("@ss.hasPermission('ecw:region:query')")
     public CommonResult<List<RegionRespVO>> listTree(RegionListReqVO reqVO) {
         List<RegionDO> list = regionService.getSimpleDepts(reqVO);
         list.sort(Comparator.comparing(RegionDO::getSort));
@@ -173,8 +173,10 @@ public class RegionController {
 
     @GetMapping("/getTradeCityList")
     @ApiOperation("获得始发、目的城市列表")
-//    @PreAuthorize("@ss.hasPermission('ecw:region:query')")
-    public CommonResult<List<RegionRespVO>> getTradeCityList(TradeRegionListReqVO reqVO) {
+    //@PreAuthorize("@ss.hasPermission('ecw:region:query')")
+    public CommonResult<List<RegionRespVO>> getTradeCityList(
+            TradeRegionListReqVO reqVO) {
+
         if (Objects.nonNull(reqVO.getChannelId())){
             // 如果有渠道信息，则查询可出目的地国家下的目的地城市
             QueryChannelInfoEvent channelInfoEvent = new QueryChannelInfoEvent();

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInServiceImpl.java

@@ -342,7 +342,8 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
         // 判断是否有未处理的审核单
         throwProcessingApproval(orderDO);
 
-        this.validateProdAttrAccess(createReqVO.getProdId(), orderDO.getOrderNo());
+        this.validateProdAttrAccess(createReqVO.getProdId(),
+                orderDO.getOrderNo());
 
 
         validateWarehouseInItem(orderDO,
@@ -381,7 +382,10 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
         orderService.orderInWarehouse(orderWarehouseInVO);
 
         // 更新订单状态 - 入库中
-        orderService.updateStatus(orderId, orderDO.getOrderNo(), OrderStatusEnum.WAREHOUSING.getValue(), null, OrderWarehouseInStatusEnum.warehousing.getValue(), null, null, null, false);
+        orderService.updateStatus(orderId, orderDO.getOrderNo(),
+                OrderStatusEnum.WAREHOUSING.getValue(),
+                null,
+                OrderWarehouseInStatusEnum.warehousing.getValue(), null, null, null, false);
 
         // 纪录操作日志
         if (createReqVO.getIsAddOrderOperateLog()) {

yudao-module-product/yudao-module-product-core/src/main/resources/mapper/product/ProductPriceMapper.xml

@@ -73,10 +73,12 @@
 			AND FIND_IN_SET(#{params.attrId}, ep.attr_id)
 		</if>
 
+		<!--运输方式-->
 		<if test="params.transportType != null and params.transportType != ''">
 			and ewl.transport_type = #{params.transportType}
 		</if>
 
+		<!--出货渠道-->
 		<if test="params.shippingChannelId != null">
 			and epp.shipping_channel_id = #{params.shippingChannelId}
 		</if>
@@ -93,6 +95,7 @@
 			and epp.need_pay = #{params.needPay}
 		</if>
 
+		<!--价格类型 0是运费加清关费，1是全包价-->
 		<if test="params.priceType != null">
 			and epp.price_type = #{params.priceType}
 		</if>
@@ -414,4 +417,4 @@
 	</select>
 
 
-</mapper>
+</mapper>
\ No newline at end of file

yudao-module-product/yudao-module-product-rest/src/main/java/cn/iocoder/yudao/module/product/controller/admin/product/ProductPriceController.java

@@ -97,7 +97,8 @@ public class ProductPriceController {
     @PutMapping("/updateAir")
     @ApiOperation("更新空运路线产品")
     @Idempotent(timeout = 5)
-    public CommonResult<Boolean> updateProductPriceAir(@Valid @RequestBody ProductPriceAirUpdateReqVO productPriceAirUpdateReqVO) {
+    public CommonResult<Boolean> updateProductPriceAir(
+            @Valid @RequestBody ProductPriceAirUpdateReqVO productPriceAirUpdateReqVO) {
         productPriceService.updateProductPriceAir(productPriceAirUpdateReqVO);
         return success(true);
     }
@@ -218,9 +219,14 @@ public class ProductPriceController {
     @GetMapping("/page")
     @ApiOperation("获得路线产品分页")
     @PreAuthorize("@ss.hasPermission('ecw:product-price:query')")
-    public CommonResult<PageResult<ProductPriceRespVO>> getProductPricePage(@Valid ProductPricePageReqVO pageVO) {
-        PageResult<ProductPriceDO> pageResult = productPriceService.getProductPricePage(pageVO);
-        PageResult<ProductPriceRespVO> respPageResult = ProductPriceConvert.INSTANCE.convertPage(pageResult);
+    public CommonResult<PageResult<ProductPriceRespVO>> getProductPricePage(
+            @Valid ProductPricePageReqVO pageVO) {
+
+        PageResult<ProductPriceDO> pageResult =
+                productPriceService.getProductPricePage(pageVO);
+
+        PageResult<ProductPriceRespVO> respPageResult =
+                ProductPriceConvert.INSTANCE.convertPage(pageResult);
         productPriceService.matchLineAndProduct(respPageResult.getList());
         return success(respPageResult);
     }

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java

@@ -2550,7 +2550,7 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
 
                 long orderExitNum = boxOrderExitService.count(
                         new LambdaQueryWrapper<BoxOrderExitDO>()
-                        .eq(BoxOrderExitDO::getShipmentId, shipmentId)
+                                .eq(BoxOrderExitDO::getShipmentId, shipmentId)
                 );
                 boxBackVO.setOrderExitNum(orderExitNum);
             }
@@ -3453,33 +3453,36 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
                     .map(BoxAbnormalDO::getShipmentId)
                     .collect(Collectors.toList());
             List<BoxDO> boxList = getBoxList(shipmentIdList);
-            Map<Long, BoxDO> boxMap = boxList.stream()
-                    .collect(Collectors.toMap(BoxDO::getId, v -> v));
-
-            for (BoxAbnormalDO abnormalDO : abnormalList) {
-                String notifyUsers = abnormalDO.getNotifyUsers();
-                if (notifyUsers == null) continue;
-                Long shipmentId = abnormalDO.getShipmentId();
-                Integer opStep = abnormalDO.getOpStep();
-                BoxDO boxDO = boxMap.get(shipmentId);
-                String transportType = boxDO.getTransportType();
-                if (CollectionUtil.isNotEmpty(transportTypeList)) {
-                    if (!transportTypeList.contains(transportType)) continue;
-                }
+            if (CollectionUtil.isNotEmpty(boxList)) {
+
+                Map<Long, BoxDO> boxMap = boxList.stream()
+                        .collect(Collectors.toMap(BoxDO::getId, v -> v));
+
+                for (BoxAbnormalDO abnormalDO : abnormalList) {
+                    String notifyUsers = abnormalDO.getNotifyUsers();
+                    if (notifyUsers == null) continue;
+                    Long shipmentId = abnormalDO.getShipmentId();
+                    Integer opStep = abnormalDO.getOpStep();
+                    BoxDO boxDO = boxMap.get(shipmentId);
+                    String transportType = boxDO.getTransportType();
+                    if (CollectionUtil.isNotEmpty(transportTypeList)) {
+                        if (!transportTypeList.contains(transportType)) continue;
+                    }
 
-                String[] userArray = notifyUsers.split(",");
-                NoticeTypeEnum typeEnum = null;
-                if (opStep.equals(AbnormalStepEnum.CUSTOMS.getStep())) {
-                    typeEnum = NoticeTypeEnum.ABNORMAL_CUSTOMS;
-                } else if (opStep.equals(AbnormalStepEnum.SHIPPING.getStep())) {
-                    typeEnum = NoticeTypeEnum.ABNORMAL_SHIPPING;
-                } else if (opStep.equals(AbnormalStepEnum.ARRIVAL.getStep())) {
-                    typeEnum = NoticeTypeEnum.ABNORMAL_ARRIVAL;
-                }
-                Date noticeTime = abnormalDO.getAbnEndTime();
-                for (String userId : userArray) {
-                    if (!userId.equals(loginUserId.toString())) continue;
-                    noticeList.add(addNotice(typeEnum, boxDO, noticeTime));
+                    String[] userArray = notifyUsers.split(",");
+                    NoticeTypeEnum typeEnum = null;
+                    if (opStep.equals(AbnormalStepEnum.CUSTOMS.getStep())) {
+                        typeEnum = NoticeTypeEnum.ABNORMAL_CUSTOMS;
+                    } else if (opStep.equals(AbnormalStepEnum.SHIPPING.getStep())) {
+                        typeEnum = NoticeTypeEnum.ABNORMAL_SHIPPING;
+                    } else if (opStep.equals(AbnormalStepEnum.ARRIVAL.getStep())) {
+                        typeEnum = NoticeTypeEnum.ABNORMAL_ARRIVAL;
+                    }
+                    Date noticeTime = abnormalDO.getAbnEndTime();
+                    for (String userId : userArray) {
+                        if (!userId.equals(loginUserId.toString())) continue;
+                        noticeList.add(addNotice(typeEnum, boxDO, noticeTime));
+                    }
                 }
             }
         }

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxOrderCheckInfo/BoxOrderCheckInfoServiceImpl.java

@@ -675,7 +675,8 @@ public class BoxOrderCheckInfoServiceImpl extends AbstractService<BoxOrderCheckI
         return tagList;
     }
 
-    private List<BoxOrderCheckInfoDO> getOrderTagNumCaseList(OrderDO orderDO, List<OrderLabelDO> orderLabelList) {
+    private List<BoxOrderCheckInfoDO> getOrderTagNumCaseList(
+            OrderDO orderDO, List<OrderLabelDO> orderLabelList) {
         //从OrderLabel里面查找订单的箱号
         String orderNo = orderDO.getOrderNo();
         List<BoxOrderCheckInfoDO> tagList = new ArrayList<>();

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxPreloadGoods/BoxPreloadGoodsServiceImpl.java

@@ -855,7 +855,8 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
     }
 
     @Override
-    public BoxGoodsStatistics calculationStatisticsByOrderList(Collection<OrderDO> orderDOList) {
+    public BoxGoodsStatistics calculationStatisticsByOrderList(
+            Collection<OrderDO> orderDOList) {
         BoxGoodsStatistics boxGoodsStatistics = new BoxGoodsStatistics();
         if (CollectionUtil.isEmpty(orderDOList)) {
             return boxGoodsStatistics;
@@ -865,17 +866,19 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
             BigDecimal volumeSum = boxGoodsStatistics.getVolume();
             BigDecimal weightSum = boxGoodsStatistics.getWeight();
 
-            if (orderDO.getSumNum() != null) {
-                numSum += orderDO.getSumNum();
-                boxGoodsStatistics.setNum(numSum);
-            }
-            if (orderDO.getSumVolume() != null) {
-                volumeSum = volumeSum.add(orderDO.getSumVolume()).setScale(2, BigDecimal.ROUND_DOWN);
-                boxGoodsStatistics.setVolume(volumeSum);
-            }
-            if (orderDO.getSumWeight() != null) {
-                weightSum = weightSum.add(orderDO.getSumWeight()).setScale(2, BigDecimal.ROUND_DOWN);
-                boxGoodsStatistics.setWeight(weightSum);
+            if(orderDO!=null) {
+                if (orderDO.getSumNum() != null) {
+                    numSum += orderDO.getSumNum();
+                    boxGoodsStatistics.setNum(numSum);
+                }
+                if (orderDO.getSumVolume() != null) {
+                    volumeSum = volumeSum.add(orderDO.getSumVolume()).setScale(2, BigDecimal.ROUND_DOWN);
+                    boxGoodsStatistics.setVolume(volumeSum);
+                }
+                if (orderDO.getSumWeight() != null) {
+                    weightSum = weightSum.add(orderDO.getSumWeight()).setScale(2, BigDecimal.ROUND_DOWN);
+                    boxGoodsStatistics.setWeight(weightSum);
+                }
             }
         }
         return boxGoodsStatistics;
@@ -3160,6 +3163,7 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
         List<Long> preloadOrderIds = boxPreloadGoodsDOS.stream().map(BoxPreloadGoodsDO::getOrderId).distinct().collect(Collectors.toList());
         if (CollectionUtil.isNotEmpty(boxMergePkgDOS)) {
             for (BoxMergePkgDO boxMergePkgDO : boxMergePkgDOS) {
+
                 List<BoxPkgOrderDO> boxPkgOrderDOS = boxPkgOrderService.selectList(BoxPkgOrderDO::getPkgId, boxMergePkgDO.getId());
                 if (CollectionUtil.isNotEmpty(boxPkgOrderDOS)) {
                     List<Long> orderIds = boxPkgOrderDOS.stream().map(BoxPkgOrderDO::getOrderId).collect(Collectors.toList());

yudao-module-shipment/yudao-module-shipment-rest/src/main/java/cn/iocoder/yudao/module/shipment/controller/admin/BoxMergePkgController.java

@@ -49,7 +49,8 @@ public class BoxMergePkgController {
     @PostMapping("/create")
     @ApiOperation("创建合包箱")
     //@PreAuthorize("@ss.hasPermission('ecw:box-merge-pkg:create')")
-    public CommonResult<String> createBoxMergePkg(@Valid @RequestBody BoxMergePkgCreateReqVO createReqVO) {
+    public CommonResult<String> createBoxMergePkg(
+            @Valid @RequestBody BoxMergePkgCreateReqVO createReqVO) {
         return success(boxMergePkgService.createBoxMergePkg(createReqVO));
     }
 
@@ -101,7 +102,8 @@ public class BoxMergePkgController {
     @ApiOperation("获得合包箱分页")
     //@PreAuthorize("@ss.hasPermission('ecw:box-merge-pkg:query')")
     public CommonResult<PageResult<BoxMergePkgPageDto>> getBoxMergePkgPage(@Valid BoxMergePkgQueryVO query, PageVO page) {
-        PageResult<BoxMergePkgPageDto> pageResult = boxMergePkgService.getBoxMergePkgPage(query, page);
+        PageResult<BoxMergePkgPageDto> pageResult =
+                boxMergePkgService.getBoxMergePkgPage(query, page);
         return success(pageResult);
     }
 
@@ -109,7 +111,8 @@ public class BoxMergePkgController {
     @ApiOperation("获得未装箱列表分页")
 //    //@PreAuthorize("@ss.hasPermission('ecw:box-merge-pkg:query')")
     public CommonResult<PageResult<BoxMergePkgWebVO>> getUnPkgPage(PageVO page,@RequestParam("shipmentId") Long shipmentId) {
-        PageResult<BoxMergePkgWebVO> pageResult = boxMergePkgService.getUnPkgPage(page,shipmentId);
+        PageResult<BoxMergePkgWebVO> pageResult =
+                boxMergePkgService.getUnPkgPage(page,shipmentId);
         return success(pageResult);
     }