订单完结冻结收费策略优化

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/LogisticsOrderV1Enum.java

@@ -28,7 +28,7 @@ public enum LogisticsOrderV1Enum {
      */
     IN_TRANSIT(10, "inTransit", "10", "运输中"),
     /**
-     * 物流订单-已完成
+     * 物流订单-完结中
      */
     NEARING_COMPLETION(15, "haveFinished", "15", "完结中"),
     /**

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

@@ -3075,7 +3075,7 @@ public class KwoTradeOrderService {
         KwoTradeOrder kwoTradeOrderDB = kwoTradeOrderMapper.selectOne(new LambdaQueryWrapper<KwoTradeOrder>().eq(KwoTradeOrder::getId, tradeOrderSettleParam.getId()).eq(KwoTradeOrder::getDelFlag, 0));
         List<KwtLogisticsOrderVO> logisticOrderList = transportRemoteService.getLogisticOrderList(new OrderFinishParam(tradeOrderSettleParam.getId()));
         if (CollUtil.isNotEmpty(logisticOrderList)) {
-            if (logisticOrderList.stream().allMatch(d -> Objects.equals(d.getStatus(), LogisticsOrderV1Enum.NEARING_COMPLETION.getCode()))) {
+            if (logisticOrderList.stream().allMatch(d -> Objects.equals(d.getStatus(), LogisticsOrderV1Enum.COMPLETED.getCode()))) {
                 kwoTradeOrder.setStatus(TradeOrderStatusEnum.SUCCESS.getCode());
                 // 预付钱包完结：解冻 + 按实际装/卸货量消费
                 calculatePrepaidBalance(kwoTradeOrderDB);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/ParkingChangeStrategyQueryParam.java

@@ -23,7 +23,6 @@ public class ParkingChangeStrategyQueryParam extends PageReq implements Serializ
     /**
      * 平台企业id
      */
-    @NotNull(message = "平台企业id不能为空")
     @Schema(description = "平台企业id")
     private Long entId;
 

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

@@ -60,9 +60,6 @@ public class ParkingChangeStrategyService {
      */
     public PageDataResult<ParkingChangeStrategyResp> pageQueryChangeStrategy(ParkingChangeStrategyQueryParam param) {
         log.info("分页查询收费策略：{}", JSON.toJSONString(param));
-        if (param.getEntId() == null) {
-            throw new BusinessPlatfromException(ErrorCodeEnum.PARAM_ERROR, "平台企业id不能为空！");
-        }
 
         //构建查询条件
         LambdaQueryWrapper<KwtParkingChargeStrategy> wrapper = buildAndExecuteQuery(param);