2024-06-25-1提交

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/ProductPriceExceptionHandleListener.java

@@ -118,7 +118,7 @@ public class ProductPriceExceptionHandleListener {
                                 Constant.SYSTEM_USER_ADMIN_ID);
                         orderExceptionResultHandlerVo.setOrderExceptionHandlerRemark("系统自动处理");
                         orderExceptionService.handlerExceptionByExceptionId(orderExceptionResultHandlerVo);
-                        //end lanbm 2024-06-06 把以前的注释开启
+
                     }*/
 
                 }
@@ -152,7 +152,7 @@ public class ProductPriceExceptionHandleListener {
                 //修改这些订单的未报价异常为已处理
                 /*
                 if (productPriceDO.getNeedOrderInquiry() == 1) {
-                    //lanbm 2024-06-06 把以前的注释开启
+
                     OrderExceptionResultHandlerVo orderExceptionResultHandlerVo =
                             new OrderExceptionResultHandlerVo();
                     orderExceptionResultHandlerVo.setOrderExceptionId(orderExceptionDO.getId());
@@ -160,7 +160,7 @@ public class ProductPriceExceptionHandleListener {
                     orderExceptionResultHandlerVo.setHandlerId(Constant.SYSTEM_USER_ADMIN_ID); //admin
                     orderExceptionResultHandlerVo.setOrderExceptionHandlerRemark("系统自动处理");
                     orderExceptionService.handlerExceptionByExceptionId(orderExceptionResultHandlerVo);
-                    //end lanbm 2024-06-06 把以前的注释开启
+
                 }*/
             }
 

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

@@ -1078,10 +1078,12 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
         Long orderId = finishReqVO.getOrderId();
         OrderDO orderDO = orderService.getById(orderId);
         if (orderDO == null) {
-            throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_NOT_EXISTS);
+            throw ServiceExceptionUtil.exception(
+                    ErrorCodeConstants.ORDER_NOT_EXISTS);
         }
         if (OrderStatusEnum.WAREHOUSE_ADJUSTMENT.getValue().equals(orderDO.getStatus())) {
-            throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_WAREHOUSE_ADJUSTMENT_STATUS_NOT_ALLOWED_WAREHOUSE_IN);
+            throw ServiceExceptionUtil.exception(
+                    ErrorCodeConstants.ORDER_WAREHOUSE_ADJUSTMENT_STATUS_NOT_ALLOWED_WAREHOUSE_IN);
         }
         // 判断是否有未处理的审核单
         throwProcessingApproval(orderDO);
@@ -1187,7 +1189,8 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                 orderWarehouseInMapper.selectList(OrderWarehouseInDO::getOrderId,
                         orderDO.getOrderId());
 
-        //入仓修改或完成备货，入仓重量、备货重量变化后，按最新入仓或备货重量，重新计算泡重，按最新入仓重量与订单泡货标准重新计算泡重。
+        //入仓修改或完成备货，入仓重量、备货重量变化后，按最新入仓或备货重量，
+        // 重新计算泡重，按最新入仓重量与订单泡货标准重新计算泡重。
         // 清空之前申请的固定泡重优惠，之前申请泡货标准还原到初始泡货标准。
         resetSpecialVWeightAndWeightUnit(orderId, orderDO,
                 finishReqVO.getIsSumWeightNoChange(),
@@ -1281,7 +1284,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
             boolean firstRucang = orderDO.getRucangTime() == null;
 
             if (firstRucang) {
-                //在下面的函数中完成费用计算 lanbm 2024-06-20 添加注释
+                //在下面的函数中完成费用计算
                 orderService.finishOrderWarehouseIn(orderDO.getOrderId());
             } else {
                 orderService.finishOrderWarehouseInUpdate(orderDO.getOrderId());
@@ -1331,7 +1334,9 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
             }
         }
 
-        // 针对未处理的异常，判断异常的orderItemId不在订单的orderItemList中的，需要删除异常。（说明此订单项已被删除，场景：pda的新品入仓后会生成未报价异常，又删除入仓时未删除异常）
+        // 针对未处理的异常，判断异常的orderItemId不在订单的orderItemList中的，
+        // 需要删除异常。（说明此订单项已被删除，场景：
+        // pda的新品入仓后会生成未报价异常，又删除入仓时未删除异常）
         List<OrderExceptionDO> orderUnProcessExceptionList =
                 orderExceptionService.getPendingOrderExceptionByOrderIdAndOrderItemIdAndExceptionKey(orderId, null, null);
         if (CollectionUtil.isNotEmpty(orderUnProcessExceptionList)) {
@@ -1443,7 +1448,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                     "仓库操作", msg, "");
         }
 
-        //入仓完成，计算V值 lanbm 2024-05-13 add
+        //入仓完成，计算V值
         /*27号注释掉
         CalculateOrderVValueEvent event=new CalculateOrderVValueEvent();
         event.setOrderId(orderId);

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/orderWarehouseIn/OrderWarehouseInController.java

@@ -136,7 +136,7 @@ public class OrderWarehouseInController {
     public CommonResult<Boolean> finishWarehouseIn(
             @Valid @RequestBody OrderWarehouseInFinishReqVO finishReqVO) {
 
-        //lanbm 2024-05-26 在此处添加注释
+        //完成入仓
         String redisKey = MessageFormat.format(ORDER_FINISH_WAREHOUSE_IN_KEY,
                 finishReqVO.getOrderId().toString());
         Long count = redisHelper.incrBy(redisKey, 1);

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

@@ -3092,7 +3092,7 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
         List<ProductPriceStepDO> allStepList = buildAllStepList(updateReqVO);
         clearAndSavePriceStepList(Collections.singletonList(updateReqVO.getId()), allStepList, priceTransportTypeMap, false);
 
-        //根据价格id获取和此价格关联的订单 lanbm 2024-05-31 添加注释
+        //根据价格id获取和此价格关联的订单
         handleOrderException(Collections.singletonList(priceId), true);
     }