添加app菜单

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/repository/KwfTruckRepository.java

@@ -87,4 +87,10 @@ public class KwfTruckRepository extends ServiceImpl<KwfTruckMapper, KwfTruck> {
         );
     }
 
+    public List<KwfTruck> findTruckByTruckNos(List<String> truckNos) {
+        return list(Wrappers.<KwfTruck>lambdaQuery()
+                .eq(BaseModel::getDelFlag,0)
+                .in(KwfTruck::getTruckNo, truckNos)
+                .orderByDesc(BaseModel::getId));
+    }
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -1978,6 +1978,11 @@ public class KwfTruckService {
         if (CollectionUtils.isNotEmpty( result)){
             result =  result.stream().filter(x->x.getValid()).collect(Collectors.toList());
         }
+        List<TruckValidateVo> r = result.stream().filter(x -> Objects.nonNull(x.getTruckId()))
+                .collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(r)){
+            throw new BusinessException("车牌识别失败");
+        }
         return result;
     }
 

sckw-modules/sckw-fleet/src/main/resources/bootstrap-cxf.yml

@@ -3,16 +3,16 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: @nacos.server@
+        server-addr: 118.116.4.155:8848
         # 命名空间
-        namespace: @nacos.namespace@
+        namespace: sckw-ng-service-platform-xf
         # 共享配置
         group: sckw-ng-service-platform
       config:
         # 配置中心地址
-        server-addr: @nacos.server@
+        server-addr: 118.116.4.155:8848
         # 命名空间
-        namespace: @nacos.namespace@
+        namespace: sckw-ng-service-platform-xf
         # 共享配置
         group: sckw-ng-service-platform
         # 配置文件格式

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

@@ -2273,7 +2273,11 @@ public class KwoTradeOrderService {
         if (!Objects.equals(order.getStatus(), TradeOrderStatusEnum.AUDIT.getCode())) {
             throw new BusinessException("当前订单状态不允许撤销");
         }
-        TradeContractResDto tradeContractResDto = remoteContractService.queryTradeContract(param.getTradeContractId(), param.getGoodsId());
+        KwoTradeOrderContract byOrderId = kwoTradeOrderContractService.getByOrderId(param.getTradeContractId());
+        if (Objects.isNull(byOrderId)) {
+            throw new BusinessException("贸易合同不存在");
+        }
+        TradeContractResDto tradeContractResDto = remoteContractService.queryTradeContract(byOrderId.getContractId(), param.getGoodsId());
         // 1. 线下钱包加回预付余额、减冻结金额
         List<TradeContractUnitDto> unitList = tradeContractResDto.getUnitList();
         WalletPrepaidDto freezeDto = new WalletPrepaidDto();

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtLogisticsConsignmentService.java

@@ -3635,6 +3635,9 @@ public class KwtLogisticsConsignmentService {
                 .filter(org.apache.commons.lang3.StringUtils::isNotBlank)
                 .map(Long::valueOf)
                 .toList();
+        if (CollectionUtils.isEmpty(reqTruckIds)) {
+            throw new BusinessException("车辆id不能为空");
+        }
         Map<Long, RTruckVo> truckMap = remoteFleetService.findTruckByTruckIds(reqTruckIds).stream()
                 .collect(Collectors.toMap(RTruckVo::getId, Function.identity(), (k1, k2) -> k1));
         final int disabledTruckStatus = 1;