来佣检核列表查询分页总数2

yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java

@@ -45,6 +45,8 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
         try {
         try {
             // 分页结果集
             // 分页结果集
             PageInfo<ComeCommissionVO> pageInfo = this.queryComeCommissionListPage(requestVO);
             PageInfo<ComeCommissionVO> pageInfo = this.queryComeCommissionListPage(requestVO);
+            resp.setDataList(pageInfo.getList());
+            pageInfo.setList(null);
             // 不分页结果集统计总单数，总保费，总来佣
             // 不分页结果集统计总单数，总保费，总来佣
             List<ComeCommissionVO> dataList = lifeCommissionMapper.queryComeCommissionList(requestVO);
             List<ComeCommissionVO> dataList = lifeCommissionMapper.queryComeCommissionList(requestVO);
             this.getSummaries(resp, dataList);
             this.getSummaries(resp, dataList);
@@ -81,21 +83,7 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
         try {
         try {
             // 寿险经纪人的财富需要初始化withdraw和pay
             // 寿险经纪人的财富需要初始化withdraw和pay
             if ("2".equals(status)) {//已比对
             if ("2".equals(status)) {//已比对
-                // 插入批次表信息
-                OrderCommissonCheck orderCommissionCheck= this.batchInsertOrderCommissionCheck(orderIds, loginId);
-                // 设置order记录的CommissionCheckId
-                this.setOrderCommissionCheckId(orderIds, status, orderCommissionCheck);
-                // 查询保单下的所有寿险经纪人的fortune记录
-                List<AclCustomerFortune> fortuneList = agmsFortuneDALService.queryLifeFortuneListByOrderIds(orderIds);
-                // 批量设置fortune为可发佣
-                fortuneList.forEach(f -> {
-                    f.setCommissionPayoutStatus("2");
-                    f.setCommissionPayoutAt(new Date());
-                    f.setCommissionPayoutBy(Long.getLong(loginId));
-                });
-                customerFortuneDalService.updateBatch(fortuneList);
-                // 初始化withdraw和pay
-                agmsFortuneService.canPaymentUpDate("2", Long.getLong("-1"), Long.getLong(loginId), fortuneList);
+                this.checkPass(orderIds, status, loginId);
 
 
             } else if ("3".equals(status)) {//已退保
             } else if ("3".equals(status)) {//已退保
                 SurrenderFortuneRequestVO surrenderFortuneRequest = new SurrenderFortuneRequestVO();
                 SurrenderFortuneRequestVO surrenderFortuneRequest = new SurrenderFortuneRequestVO();
@@ -132,12 +120,30 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
         return resp;
         return resp;
     }
     }
 
 
+    private void checkPass(List<Long> orderIds, String status, String loginId) {
+        // 插入批次表信息
+        OrderCommissonCheck orderCommissionCheck= this.batchInsertOrderCommissionCheck(orderIds, loginId);
+        // 设置order记录的CommissionCheckId
+        this.setOrderCommissionCheckId(orderIds, status, orderCommissionCheck);
+        // 查询保单下的所有寿险经纪人的fortune记录
+        List<AclCustomerFortune> fortuneList = agmsFortuneDALService.queryLifeFortuneListByOrderIds(orderIds);
+        // 批量设置fortune为可发佣
+        fortuneList.forEach(f -> {
+            f.setCommissionPayoutStatus("2");
+            f.setCommissionPayoutAt(new Date());
+            f.setCommissionPayoutBy(Long.getLong(loginId));
+        });
+        customerFortuneDalService.updateBatch(fortuneList);
+        // 初始化withdraw和pay
+        agmsFortuneService.canPaymentUpDate("2", Long.getLong("-1"), Long.getLong(loginId), fortuneList);
+    }
+
     private PageInfo<ComeCommissionVO> queryComeCommissionListPage(QueryComeCommissionListRequestVO requestVO) {
     private PageInfo<ComeCommissionVO> queryComeCommissionListPage(QueryComeCommissionListRequestVO requestVO) {
         PageInfo<ComeCommissionVO> page = requestVO.getPage();
         PageInfo<ComeCommissionVO> page = requestVO.getPage();
 
 
         String orderBy = "orderDate desc";
         String orderBy = "orderDate desc";
 
 
-        PageHelper.startPage(page.getPageNum(), page.getSize(), orderBy);
+        PageHelper.startPage(page.getPageNum(), page.getPageSize(), orderBy);
 
 
         List<ComeCommissionVO> dataList = lifeCommissionMapper.queryComeCommissionList(requestVO);
         List<ComeCommissionVO> dataList = lifeCommissionMapper.queryComeCommissionList(requestVO);
 
 

yd-api/src/main/java/com/yd/api/commission/vo/lifecommission/ComeCommissionListResponseVO.java

@@ -6,6 +6,7 @@ import com.yd.api.result.CommonResult;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.util.List;
 
 
 @Data
 @Data
 public class ComeCommissionListResponseVO {
 public class ComeCommissionListResponseVO {
@@ -24,4 +25,5 @@ public class ComeCommissionListResponseVO {
      */
      */
     private BigDecimal totalCommission;
     private BigDecimal totalCommission;
     private CommonResult commonResult;
     private CommonResult commonResult;
+    private List<ComeCommissionVO> dataList;
 }
 }