|
@@ -868,20 +868,20 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
|
|
|
myCollectInAdvanceQueryDto.setTransactionType("1");
|
|
myCollectInAdvanceQueryDto.setTransactionType("1");
|
|
|
}
|
|
}
|
|
|
Page<MyCollectInAdvanceDto> page = new Page<>(myCollectInAdvanceQueryDto.getPageNum(), myCollectInAdvanceQueryDto.getPageSize());
|
|
Page<MyCollectInAdvanceDto> page = new Page<>(myCollectInAdvanceQueryDto.getPageNum(), myCollectInAdvanceQueryDto.getPageSize());
|
|
|
- page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
|
|
|
|
|
|
|
+ // page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
|
|
|
Page<MyCollectInAdvanceDto> orderVoPage = new Page<>();
|
|
Page<MyCollectInAdvanceDto> orderVoPage = new Page<>();
|
|
|
// 1为车险板块
|
|
// 1为车险板块
|
|
|
if ("1".equals(myCollectInAdvanceQueryDto.getBusinessSegmentsType())) {
|
|
if ("1".equals(myCollectInAdvanceQueryDto.getBusinessSegmentsType())) {
|
|
|
//金额类型 1. 手续费金额 +跟单金额 2. 推广金额
|
|
//金额类型 1. 手续费金额 +跟单金额 2. 推广金额
|
|
|
if("2".equals(myCollectInAdvanceQueryDto.getTransactionType())){
|
|
if("2".equals(myCollectInAdvanceQueryDto.getTransactionType())){
|
|
|
orderVoPage = insFeeOrderNewService.findMyCollectInAdvanceWillAmountByUserId(page,myCollectInAdvanceQueryDto);
|
|
orderVoPage = insFeeOrderNewService.findMyCollectInAdvanceWillAmountByUserId(page,myCollectInAdvanceQueryDto);
|
|
|
- Long total=insFeeOrderNewService.findMyCollectInAdvanceWillAmountByUserIdCount(myCollectInAdvanceQueryDto);
|
|
|
|
|
- orderVoPage.setTotal(total);
|
|
|
|
|
|
|
+ // Long total=insFeeOrderNewService.findMyCollectInAdvanceWillAmountByUserIdCount(myCollectInAdvanceQueryDto);
|
|
|
|
|
+ // orderVoPage.setTotal(total);
|
|
|
sumAmount = insFeeOrderNewService.findSumWillAmount(myCollectInAdvanceQueryDto);
|
|
sumAmount = insFeeOrderNewService.findSumWillAmount(myCollectInAdvanceQueryDto);
|
|
|
}else{
|
|
}else{
|
|
|
orderVoPage = insFeeOrderNewService.findMyCollectInAdvanceSumByUserId(page,myCollectInAdvanceQueryDto);
|
|
orderVoPage = insFeeOrderNewService.findMyCollectInAdvanceSumByUserId(page,myCollectInAdvanceQueryDto);
|
|
|
- Long total=insFeeOrderNewService.findMyCollectInAdvanceSumByUserIdCount(myCollectInAdvanceQueryDto);
|
|
|
|
|
- orderVoPage.setTotal(total);
|
|
|
|
|
|
|
+ // Long total=insFeeOrderNewService.findMyCollectInAdvanceSumByUserIdCount(myCollectInAdvanceQueryDto);
|
|
|
|
|
+ // orderVoPage.setTotal(total);
|
|
|
sumAmount = insFeeOrderNewService.findSumAmount(myCollectInAdvanceQueryDto);
|
|
sumAmount = insFeeOrderNewService.findSumAmount(myCollectInAdvanceQueryDto);
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
@@ -972,7 +972,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
|
|
|
myIncomeAndExpensesQueryDto.setEndDate(dateMap.get("endDate"));
|
|
myIncomeAndExpensesQueryDto.setEndDate(dateMap.get("endDate"));
|
|
|
|
|
|
|
|
Page<MyCollectInAdvanceDto> page = new Page<>(myIncomeAndExpensesQueryDto.getPageNum(), myIncomeAndExpensesQueryDto.getPageSize());
|
|
Page<MyCollectInAdvanceDto> page = new Page<>(myIncomeAndExpensesQueryDto.getPageNum(), myIncomeAndExpensesQueryDto.getPageSize());
|
|
|
- page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
|
|
|
|
|
|
|
+ //page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
|
|
|
Page<MyCollectInAdvanceDto> orderVoPage = new Page<>();
|
|
Page<MyCollectInAdvanceDto> orderVoPage = new Page<>();
|
|
|
if (myIncomeAndExpensesQueryDto.getBusinessSegmentsType() != null && "0".equals(myIncomeAndExpensesQueryDto.getBusinessSegmentsType())) {
|
|
if (myIncomeAndExpensesQueryDto.getBusinessSegmentsType() != null && "0".equals(myIncomeAndExpensesQueryDto.getBusinessSegmentsType())) {
|
|
|
myIncomeAndExpensesQueryDto.setBusinessSegmentsType(null);
|
|
myIncomeAndExpensesQueryDto.setBusinessSegmentsType(null);
|
|
@@ -1023,8 +1023,8 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
|
|
|
myIncomeAndExpensesQueryDto.setIncomeAndExpensesType("1");
|
|
myIncomeAndExpensesQueryDto.setIncomeAndExpensesType("1");
|
|
|
}
|
|
}
|
|
|
orderVoPage = sysUserAccountHistoryService.findMyIncomeAndExpensesAmountByUserId(page,myIncomeAndExpensesQueryDto);
|
|
orderVoPage = sysUserAccountHistoryService.findMyIncomeAndExpensesAmountByUserId(page,myIncomeAndExpensesQueryDto);
|
|
|
- Long total=sysUserAccountHistoryService.findMyIncomeAndExpensesAmountByUserIdCount(myIncomeAndExpensesQueryDto);
|
|
|
|
|
- orderVoPage.setTotal(total);
|
|
|
|
|
|
|
+ // Long total=sysUserAccountHistoryService.findMyIncomeAndExpensesAmountByUserIdCount(myIncomeAndExpensesQueryDto);
|
|
|
|
|
+ // orderVoPage.setTotal(total);
|
|
|
List<MyCollectInAdvanceDto> recordsNew =new ArrayList<>();
|
|
List<MyCollectInAdvanceDto> recordsNew =new ArrayList<>();
|
|
|
if(orderVoPage.getRecords()!=null && orderVoPage.getRecords().size()>0){
|
|
if(orderVoPage.getRecords()!=null && orderVoPage.getRecords().size()>0){
|
|
|
for(MyCollectInAdvanceDto dto :orderVoPage.getRecords()) {
|
|
for(MyCollectInAdvanceDto dto :orderVoPage.getRecords()) {
|