fix

sckw-modules-api/sckw-payment-api/pom.xml

@@ -18,5 +18,26 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
 
-</project>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sckw</groupId>
+            <artifactId>sckw-common-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-annotations-jakarta</artifactId>
+            <version>2.2.22</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -2129,9 +2129,9 @@ public class KwoTradeOrderService {
         if (Objects.isNull(tradeContractResDto)) {
             throw new BusinessException("贸易合同不存在");
         }
-
+        Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.UNIT_TYPE.getType()));
         List<LogisticsEntDtoVO> validContractLog = new ArrayList<>();
-        List<LogisticsEntDto> logisticsContractId =new ArrayList<>();
+        List<LogisticsEntDto> logisticsContractId = new ArrayList<>();
         if (Objects.equals(DispatchWayEnums.AUTO_DISPATCH.getCode(), tradeContractResDto.getDispatchWay())) {
             //自动派单校验： 判断当前有无包含该商品的有效自动派车物流合同
             validContractLog = checkAutoContractLogOrder(unitMap, byOrderId, tradeContractResDto);
@@ -2353,6 +2353,10 @@ public class KwoTradeOrderService {
         addLogisticOrderParam.setGoodsName(byOrderId.getGoodsName());
         addLogisticOrderParam.setGoodsType(byOrderId.getGoodsType());
         addLogisticOrderParam.setGoodsPrice(byOrderId.getUnitPrice());
+        Map<String, String> map = dict.get(DictTypeEnum.UNIT_TYPE.getType());
+        if (CollUtil.isNotEmpty(map)) {
+            addLogisticOrderParam.setGoodsUnit(map.get(byOrderId.getUnit()));
+        }
         addLogisticOrderParam.setGoodsPriceUnit(byOrderId.getUnit());
         List<KwoTradeOrderAddress> kwoTradeOrderAddresses = addressMap.get(String.valueOf(AddressTypeEnum.SHIPMENT.getCode()));
         KwoTradeOrderAddress kwoTradeOrderAddress = kwoTradeOrderAddresses.get(0);
@@ -2400,14 +2404,11 @@ public class KwoTradeOrderService {
         KwoTradeOrderUnit tradeOrderUnit = unitMap.get(String.valueOf(Global.NUMERICAL_TWO));
         //查询满足自动派单的物流合同
         List<LogisticsEntDtoVO> contractLogisticsList = remoteContractService.queryAutoContractLogOrder(tradeOrderUnit.getEntId(), Lists.newArrayList(byOrderId.getId()));
-        validContractLog = contractLogisticsList.stream()
-                .filter(Objects::nonNull)
-                .filter(log -> log.getStartTime() != null && log.getEndTime() != null)
-                .filter(log -> {
-                    boolean startTimeOk = log.getStartTime().after(tradeContractResDto.getStartTime());
-                    boolean endTimeOk = tradeContractResDto.getEndTime() == null || log.getEndTime().before(tradeContractResDto.getEndTime());
-                    return startTimeOk && endTimeOk;
-                }).collect(Collectors.toList());
+        validContractLog = contractLogisticsList.stream().filter(Objects::nonNull).filter(log -> log.getStartTime() != null && log.getEndTime() != null).filter(log -> {
+            boolean startTimeOk = log.getStartTime().after(tradeContractResDto.getStartTime());
+            boolean endTimeOk = tradeContractResDto.getEndTime() == null || log.getEndTime().before(tradeContractResDto.getEndTime());
+            return startTimeOk && endTimeOk;
+        }).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(validContractLog)) {
             throw new BusinessException("未找到该商品有效的自动派车物流合同，请先签订自动派车物流合同");
         }
@@ -2546,6 +2547,7 @@ public class KwoTradeOrderService {
 
     /**
      * 查询增补运力物流合同（手动派车物流合同）
+     *
      * @param param
      * @return
      */
@@ -2559,14 +2561,11 @@ public class KwoTradeOrderService {
         }
         //查询满足手动派单的物流合同
         List<LogisticsEntDtoVO> contractLogisticsList = remoteContractService.queryContractLogOrder(param.getSupEntId(), param.getGoodsId());
-        List<LogisticsEntDtoVO> validContractLog = contractLogisticsList.stream()
-                .filter(Objects::nonNull)
-                .filter(log -> log.getStartTime() != null && log.getEndTime() != null)
-                .filter(log -> {
-                    boolean startTimeOk = log.getStartTime().after(kwoTradeOrder.getStartTime());
-                    boolean endTimeOk = kwoTradeOrder.getEndTime() == null || log.getEndTime().before(kwoTradeOrder.getEndTime());
-                    return startTimeOk && endTimeOk;
-                }).collect(Collectors.toList());
+        List<LogisticsEntDtoVO> validContractLog = contractLogisticsList.stream().filter(Objects::nonNull).filter(log -> log.getStartTime() != null && log.getEndTime() != null).filter(log -> {
+            boolean startTimeOk = log.getStartTime().after(kwoTradeOrder.getStartTime());
+            boolean endTimeOk = kwoTradeOrder.getEndTime() == null || log.getEndTime().before(kwoTradeOrder.getEndTime());
+            return startTimeOk && endTimeOk;
+        }).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(validContractLog)) {
             throw new BusinessException("未找到该商品有效的自动派车物流合同，请先签订自动派车物流合同");
         }
@@ -2601,6 +2600,7 @@ public class KwoTradeOrderService {
 
     /**
      * 查询增补运力物流合同（手动派车物流合同）
+     *
      * @param param
      * @return
      */
@@ -2640,7 +2640,7 @@ public class KwoTradeOrderService {
         if (unitMap.keySet().size() < 2) {
             throw new BusinessException("贸易订单企业信息缺失");
         }
-        if(Objects.equals(tradeContractResDto.getConsignment(), 2)) {
+        if (Objects.equals(tradeContractResDto.getConsignment(), 2)) {
             throw new BusinessException("增补运力必须为卖方托运");
         }
         List<LogisticsEntDto> logisticsContractList = param.getLogisticsContractList();
@@ -2695,7 +2695,6 @@ public class KwoTradeOrderService {
             return logisticInfo;
         }).collect(Collectors.toList());
         addLogisticOrderParam.setLogisticInfo(collect);
-
         addLogisticOrderParam.setTradeOrderId(kwoTradeOrder.getId());
         addLogisticOrderParam.setTradeOrderNo(kwoTradeOrder.getTOrderNo());
         addLogisticOrderParam.setBillingMode(String.valueOf(kwoTradeOrder.getChargeType()));