merge

clx-performance-web/src/main/java/com/clx/performance/controller/temp/TempFeignController.java

-package com.clx.performance.controller.temp;
-
-import com.clx.order.feign.OrderFeign;
-import com.msl.common.result.Result;
-import io.swagger.v3.oas.annotations.Operation;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @Author: aiqingguo
- * @Description: 临时接口
- * @Date: 2023-8-21 12:10:16
- * @Version: 1.0
- */
-@Slf4j
-@RestController
-@RequestMapping(value="/temp/feign")
-@AllArgsConstructor
-public class TempFeignController {
-
-    private OrderFeign orderFeign;
-
-    @Operation(summary = "测试feign", description = "<br>By:刘海泉")
-    @GetMapping("/replaceFeignHttp")
-    public Result<Object> replaceFeignHttp() {
-
-        orderFeign.testFeignHttp();
-
-        return Result.ok();
-    }
-
-}

clx-performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -217,14 +217,12 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
     void batchUpdateCancel(List<OrderChild> canCancelOrderChildList);
 
-    int countTakeByOrderGoodsNo(String orderGoodsNo);
     int countLoadByOrderGoodsNo(String orderGoodsNo);
 
     List<OrderChild> findListByChildNoList(List<String> childNoList);
 
 
     int countTakeByOrderGoodsNo(String orderGoodsNo);
-    int countLoadByOrderGoodsNo(String orderGoodsNo);
 
     List<OrderChild> listNoCancelOrderChild(String orderNo);
 }

clx-performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java

@@ -16,21 +16,16 @@ import com.clx.performance.config.ThirdAppConfig;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderChildImageDao;
 import com.clx.performance.dao.OrderGoodsDao;
-import com.clx.performance.dao.OrderChildImageDao;
 import com.clx.performance.dto.dts.DataTransportDTO;
 import com.clx.performance.enums.DtsOperationTypeEnum;
 import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.enums.OrderChildPoundAuditEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
-import com.clx.performance.enums.PerformanceResultEnum;
-import com.clx.performance.enums.OrderChildPoundAuditEnum;
 import com.clx.performance.event.OrderChildCancelEvent;
 import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderChildImage;
 import com.clx.performance.model.OrderGoods;
-import com.clx.performance.model.OrderGoods;
-import com.clx.performance.model.OrderChildImage;
 import com.clx.performance.service.LastTruckService;
 import com.clx.performance.struct.OrderChildStruct;
 import com.clx.user.feign.TruckFeign;
@@ -56,8 +51,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
-import static com.clx.performance.constant.RabbitKeyConstants.SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_CHILD_EXCHANGE;
-import static com.clx.performance.constant.RabbitKeyConstants.SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_CHILD_ROUTING_KEY;
+import static com.clx.performance.constant.RabbitKeyConstants.*;
 
 @Slf4j
 @Component

clx-performance-web/src/main/java/com/msl/common/open/core/OpenEncrypt.java

@@ -11,6 +11,9 @@ import com.msl.common.open.core.processor.ProcessorRegistry;
 import com.msl.common.result.Result;
 import com.msl.common.utils.EncryptUtil;
 import com.msl.common.utils.MslCollectionUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.FileCopyUtils;
@@ -18,9 +21,6 @@ import org.springframework.validation.BindException;
 import org.springframework.validation.FieldError;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 
-import jakarta.servlet.http.HttpServletRequest;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.List;