|
@@ -1,6 +1,7 @@
|
|
|
package com.xy.controller;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
|
import com.xy.annotate.RestMappingController;
|
|
|
import com.xy.dto.DeviceChargingHistoryDto;
|
|
|
import com.xy.service.DeviceChargingHistoryServiceImpl;
|
|
@@ -41,6 +42,23 @@ public class DeviceChargingHistoryController {
|
|
|
return deviceChargingHistoryService.pageByTopMerc(page);
|
|
|
}
|
|
|
|
|
|
+ @PostMapping("pageByTopMercCount")
|
|
|
+ @ApiOperation("加盟商-服务费管理-设备管理费佣金统计")
|
|
|
+ public R<Integer> pageByTopMercCount(@RequestBody @Validated DeviceChargingHistoryDto.PageByTopMerc page) {
|
|
|
+ page.getPage().setSize(-1);
|
|
|
+ page.setCurMercId(MercAuthUtils.getMercId());
|
|
|
+ PageBean<DeviceChargingHistoryDto.PageVo> pageVoPageBean = R.feignCheckData(deviceChargingHistoryService.pageByTopMerc(page));
|
|
|
+ List<DeviceChargingHistoryDto.PageVo> records = pageVoPageBean.getRecords();
|
|
|
+ int totalAgentMoney = 0;
|
|
|
+ if (CollUtil.isNotEmpty(records)) {
|
|
|
+ for (DeviceChargingHistoryDto.PageVo r : records) {
|
|
|
+ totalAgentMoney += r.getAgentMoney();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return R.ok(totalAgentMoney);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
@ApiOperation("加盟商-服务费管理-设备管理费明细")
|
|
|
@PostMapping("exportPageByTopMerc")
|
|
|
public void exportPageByTopMerc(HttpServletResponse response, @RequestBody @Valid DeviceChargingHistoryDto.PageByTopMerc page) throws IOException {
|