1月18日，业绩归属

src/main/java/com/example/demo/controller/cash/CashCollectionController.java

@@ -286,7 +286,7 @@ public class CashCollectionController {
                 convertTranslatedPerformanceFieldsToChinese(page.getPerformanceVO(), languageCode);
             }
 
-            Result result = Result.success(cashCollectionService.performanceSelect(page.getPageNum(), page.getPageSize(), page.getPerformanceVO()));
+            Result result = Result.success(cashCollectionService.performanceSelect(page.getPageNum(), page.getPageSize(), page.getPerformanceDTO()));
 
             // 对返回结果进行多语言转换
             if (result.getCode() == 200 && result.getData() instanceof PageInfo) {

src/main/java/com/example/demo/service/cash/CashCollectionService.java

@@ -1,5 +1,6 @@
 package com.example.demo.service.cash;
 
+import com.example.demo.domain.DTO.PerformanceDTO;
 import com.example.demo.domain.entity.CashRecord;
 import com.example.demo.domain.entity.GOrder;
 import com.example.demo.domain.entity.RechargeActivity;
@@ -45,6 +46,6 @@ public interface CashCollectionService {
     //同步事务方法
     void processBatch(List<GOrder> gOrders);
 
-    PageInfo<PerformanceVO> performanceSelect(Integer pageNum, Integer pageSize, PerformanceVO performanceDTO);
+    PageInfo<PerformanceVO> performanceSelect(Integer pageNum, Integer pageSize, PerformanceDTO performanceDTO);
 
 }

src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java

@@ -3,6 +3,7 @@ package com.example.demo.serviceImpl.cash;
 import com.example.demo.Util.JWTUtil;
 import com.example.demo.Util.LanguageTranslationUtil;
 import com.example.demo.config.RabbitMQConfig;
+import com.example.demo.domain.DTO.PerformanceDTO;
 import com.example.demo.domain.entity.*;
 import com.example.demo.domain.vo.cash.CashCollection;
 import com.example.demo.domain.vo.cash.CashCollectionMessage;
@@ -514,9 +515,9 @@ public User getNameAndMarket(Integer jwcode) {
 
     //多条件查询收款订单列表
     @Override
-    public PageInfo<PerformanceVO> performanceSelect(Integer pageNum, Integer pageSize, PerformanceVO performanceVO) {
+    public PageInfo<PerformanceVO> performanceSelect(Integer pageNum, Integer pageSize, PerformanceDTO performanceDTO) {
         PageHelper.startPage(pageNum, pageSize);     //必须要直接跟mapper
-        List<PerformanceVO> performanceVOs = cashCollectionMapper.performanceSelect(performanceVO);
+        List<PerformanceVO> performanceVOs = cashCollectionMapper.performanceSelect(performanceDTO);
         return new PageInfo<>(performanceVOs);
     }