2024-06-22提交

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/service/lineChannelPackaging/LineChannelPackagingServiceImpl.java

@@ -93,17 +93,23 @@ public class LineChannelPackagingServiceImpl extends AbstractService<LineChannel
     }
 
     @Override
-    public List<LineChannelPackagingDO> queryAirClearancePrice(List<String> packages, Long channelId, Long lineId) {
+    public List<LineChannelPackagingDO> queryAirClearancePrice(
+            List<String> packages,
+            Long channelId,
+            Long lineId) {
         List<LineChannelPackagingDO> list = new ArrayList<>();
         if (CollectionUtil.isNotEmpty(packages)) {
             for (String packageType : packages) {
-                List<LineChannelPackagingDO> packagingDOList = lineChannelPackagingMapper.queryAirClearancePrice(packageType, channelId, lineId);
+                List<LineChannelPackagingDO> packagingDOList =
+                        lineChannelPackagingMapper.queryAirClearancePrice(packageType,
+                                channelId, lineId);
                 if (CollectionUtil.isNotEmpty(packagingDOList)){
                     list.addAll(packagingDOList);
                 }
             }
         } else {
-            list = lineChannelPackagingMapper.queryAirClearancePrice(null, channelId, lineId);
+            list = lineChannelPackagingMapper.queryAirClearancePrice(null,
+                    channelId, lineId);
         }
         return list;
     }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderQueryServiceImpl.java

@@ -613,13 +613,16 @@ public class OrderQueryServiceImpl implements OrderQueryService {
         initialLogisticsInfoDto.setLineId(dto.getLineId());
         initialLogisticsInfoDto.setTransportId(dto.getTransportId());
         initialLogisticsInfoDto.setChannelId(dto.getChannelId());
-        // 保存初始物流信息，该信息为收费信息
+        //保存初始物流信息，该信息为收费信息
         dto.setInitialLogisticsInfoDto(initialLogisticsInfoDto);
         LogisticsInfoDto logisticsInfoDto = new LogisticsInfoDto();
         BeanUtils.copyProperties(initialLogisticsInfoDto, logisticsInfoDto);
-        if (Objects.nonNull(dto.getAdjustToDestWarehouseId()) && dto.getAdjustToDestWarehouseId() > 0L) {
+        if (Objects.nonNull(dto.getAdjustToDestWarehouseId()) &&
+                dto.getAdjustToDestWarehouseId() > 0L) {
+
             // 如果有始发仓调仓记录id，则获取最新的调仓仓库信息
-            WarehouseRegionVO startWarehouseRegionVO = warehouseMapper.findWarehouseRegion(dto.getAdjustToDestWarehouseId());
+            WarehouseRegionVO startWarehouseRegionVO =
+                    warehouseMapper.findWarehouseRegion(dto.getAdjustToDestWarehouseId());
             if (Objects.nonNull(startWarehouseRegionVO)) {
                 logisticsInfoDto.setStartWarehouseId(dto.getAdjustToDestWarehouseId());
                 logisticsInfoDto.setStartCityId(startWarehouseRegionVO.getShi());
@@ -632,7 +635,8 @@ public class OrderQueryServiceImpl implements OrderQueryService {
                 logisticsInfoDto.setStartVolume(startWarehouseRegionVO.getVolume());
             }
         }
-        if (Objects.nonNull(dto.getDestAdjustToDestWarehouseId()) && dto.getDestAdjustToDestWarehouseId() > 0L) {
+        if (Objects.nonNull(dto.getDestAdjustToDestWarehouseId()) &&
+                dto.getDestAdjustToDestWarehouseId() > 0L) {
             // 如果有目的地的目的仓调仓记录id，则获取最新的调仓仓库信息
             WarehouseRegionVO destWarehouseRegionVO = warehouseMapper.findWarehouseRegion(dto.getDestAdjustToDestWarehouseId());
             if (Objects.nonNull(destWarehouseRegionVO)) {

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

@@ -4894,7 +4894,8 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
     }
 
     @Override
-    public List<OrderWarehouseInWithAttrVO> getOrderWarehouseInCommonAttrList(Long orderId, Long excludeOrderWarehouseInId) {
+    public List<OrderWarehouseInWithAttrVO> getOrderWarehouseInCommonAttrList(
+            Long orderId, Long excludeOrderWarehouseInId) {
 
         // 根据订单id获取入库详情
         OrderDO orderDO = orderService.getById(orderId);
@@ -4902,13 +4903,19 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
             throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_NOT_EXISTS);
         }
 
-        List<OrderItemDO> orderItemDOList = orderItemService.list(new LambdaQueryWrapper<OrderItemDO>()
+        //订单明细
+        List<OrderItemDO> orderItemDOList =
+                orderItemService.list(new LambdaQueryWrapper<OrderItemDO>()
                 .eq(OrderItemDO::getOrderId, orderId).orderByAsc(OrderItemDO::getOrderItemId));
-        List<OrderWarehouseInDO> orderWarehouseInDOList = orderWarehouseInMapper.selectList(new LambdaQueryWrapper<OrderWarehouseInDO>()
+        //ecw_order_warehouse_in 入仓货物详情表
+        List<OrderWarehouseInDO> orderWarehouseInDOList =
+                orderWarehouseInMapper.selectList(
+                        new LambdaQueryWrapper<OrderWarehouseInDO>()
                 .eq(OrderWarehouseInDO::getOrderId, orderId).orderByAsc(OrderWarehouseInDO::getId));
 
         if (excludeOrderWarehouseInId != null) {
-            orderWarehouseInDOList = orderWarehouseInDOList.stream().filter(t -> !t.getId().equals(excludeOrderWarehouseInId)).collect(Collectors.toList());
+            orderWarehouseInDOList =
+                    orderWarehouseInDOList.stream().filter(t -> !t.getId().equals(excludeOrderWarehouseInId)).collect(Collectors.toList());
         }
 
         List<OrderWarehouseInWithAttrVO> resultList = new ArrayList<>();

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/service/product/impl/ProductPriceStepServiceImpl.java

@@ -64,7 +64,6 @@ public class ProductPriceStepServiceImpl extends AbstractService<ProductPriceSte
                                          BigDecimal num,
                                          Integer priceType) {
         //0-运费，1-全包价, 2-清关费
-
         List<ProductPriceStepDO>  list = this.list(
                 new LambdaQueryWrapperX<ProductPriceStepDO>()
                 .eq(ProductPriceStepDO::getProductPriceId, productPriceId)