Merge remote-tracking branch 'origin/v9.6_network_small_version_20240102' into test

performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java

@@ -80,9 +80,10 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
     private final OrderGoodsService orderGoodsService;
 
+    private final OwnerInfoService ownerInfoService;
+
     private final SettlementOwnerDetailDao settlementOwnerDetailDao;
 
-    private final OwnerInfoService ownerInfoService;
 
 
 

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -463,7 +463,6 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
      * 限制货单更新剩余吨数不能小于35吨
      **/
     private void limitOrderGoodsResidueWeight(BigDecimal residueTransportWeight){
-
         if(residueTransportWeight.compareTo(BigDecimal.ZERO) != 0 &&  residueTransportWeight.compareTo(new BigDecimal("35")) < 0){
             throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"当前货单剩余吨数不足35吨，无法挂单");
         }

performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java

@@ -250,7 +250,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
                 entity.setCaseOutBalance(caseOutBalance);
                 entity.setOwnerUserNo(param.getOwnerUserNo());
                 entity.setStatus(OwnerAccountEnum.CaseOutStatus.PENDING_PAYMENT.getCode());
-                entity.setCaseOutBank(param.getOwnerAccountBank());
+                entity.setCaseOutBank(param.getOwnerOpenBank());
                 entity.setCaseOutBankNumber(param.getOwnerBankAccount());
                 entity.setCreateBy(loginUserInfo.getUserName());
 

performance-web/src/main/java/com/clx/performance/sqlProvider/settle/NetworkDriverRunningWaterRecordProvider.java

@@ -62,7 +62,11 @@ public class NetworkDriverRunningWaterRecordProvider {
             }
             if (ObjectUtil.isNotNull(param.getFundType())) {
                 WHERE("a.fund_type = #{param.fundType}");
+            } else {
+                WHERE("a.fund_type != " + NetworkDriverAccountEnum.FundType.FROZEN.getCode());
             }
+            WHERE("a.running_water_type != " + NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_FROZEN.getCode());
+
             ORDER_BY("a.create_time desc");
         }}.toString();
         return sql;