Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.settle.SettlementDriverDao;
 import com.clx.performance.dao.settle.SettlementDriverDetailDao;
 import com.clx.performance.enums.PerformanceResultEnum;
-import com.clx.performance.enums.settle.SettlementDriverEnum;
 import com.clx.performance.model.settle.SettlementDriver;
 import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.param.pc.driver.BatchUpdatePayDriverSettlementParam;
@@ -56,11 +55,9 @@ public class SettlementDriverServiceImpl implements SettlementDriverService {
         if(CollectionUtils.isEmpty(list)){
             throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
         }
-        list.forEach(item->{
-            if(!Objects.equals(item.getStatus(), SettlementDriverEnum.Status.WAIT_SETTLEMENT.getCode())){
-                throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"所选数据有误，请重新选择");
-            }
-        });
+        if(Objects.equals(param.getIds().size(),list.size())){
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"所选数据有误，请重新选择");
+        }
         list.forEach(item-> settlementMqHandlerService.paySettlementDriver(item));
     }
 }

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

@@ -24,9 +24,10 @@ public class SettlementDriverDetailSqlProvider {
     public String findByDriverSettlementIds(List<Integer> ids) {
         return new SQL(){{
             SELECT("a.* ");
-            FROM("settlement_owner_detail a ");
+            FROM("settlement_driver_detail a ");
             LEFT_OUTER_JOIN("settlement_driver b on a.settlement_no = b.settlement_no");
             WHERE("b.id IN ( "  + ids.stream().map(code -> "'"+code+"'").collect(Collectors.joining(","))+ ")" );
+            WHERE("b.status = " + SettlementDriverEnum.Status.WAIT_SETTLEMENT.getCode() );
             ORDER_BY("b.create_time");
         }}.toString();
     }