|
|
@@ -773,12 +773,13 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
|
|
|
return HttpResult.error("用户不能为空");
|
|
|
}
|
|
|
Page<JSONObject> page = baseMapper.queryDataList(partnerApp.getPage(),partnerApp);
|
|
|
- List<JSONObject> datalist = page.getRecords();
|
|
|
+
|
|
|
+ List<JSONObject> datalistAll = baseMapper.queryDataList(partnerApp);
|
|
|
HashMap<String, Object> hashMap = new HashMap<>();
|
|
|
JSONObject totalMap = new JSONObject();
|
|
|
- totalMap.put("numberOrders",datalist.size());
|
|
|
- totalMap.put("totalPremium",sumField(datalist,"premium"));
|
|
|
- totalMap.put("commission",sumField(datalist,"commission"));
|
|
|
+ totalMap.put("numberOrders",datalistAll.size());
|
|
|
+ totalMap.put("totalPremium",sumField(datalistAll,"premium"));
|
|
|
+ totalMap.put("commission",sumField(datalistAll,"commission"));
|
|
|
hashMap.put("data",getPage(page));
|
|
|
hashMap.put("total",totalMap);
|
|
|
PartnerUser partnerUser = baseMapper.selectOne(new LambdaQueryWrapper<>(PartnerUser.class).eq(PartnerUser::getUserId,partnerApp.getUserId()).eq(PartnerUser::getGrade,partnerApp.getGrade()));
|