From a823bffa3800426d0a908b9397a8ea7586b5be21 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 18 十二月 2024 18:00:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopPointController.java | 55 ++++++++++++++++++++++---------------------------------
1 files changed, 22 insertions(+), 33 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopPointController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopPointController.java
index f3cbe5b..706959a 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopPointController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopPointController.java
@@ -4,10 +4,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.ShopPoint;
-import com.ruoyi.other.excel.ShopPointEX;
import com.ruoyi.other.service.ShopPointService;
import com.ruoyi.other.vo.ShopPointStatistics;
import io.swagger.annotations.Api;
@@ -18,8 +17,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
/**
* <p>
@@ -35,6 +32,8 @@
public class ShopPointController {
@Resource
private ShopPointService shopPointService;
+ @Resource
+ private TokenService tokenService;
/**
@@ -47,6 +46,23 @@
return R.ok(statistics);
}
+ @GetMapping("/shop/statistics")
+ @ApiOperation(value = "门店积分统计", notes = "门店积分统计", tags = {"门店后台"})
+ public R<ShopPointStatistics> shopstatistics(ShopPoint shopPoint) {
+ Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
+ shopPoint.setShopId(objectId);
+ ShopPointStatistics statistics = shopPointService.statistics(Page.of(shopPoint.getPageNum(), shopPoint.getPageSize()), shopPoint);
+ return R.ok(statistics);
+ }
+ @GetMapping("/shop/statistics/list")
+ @ApiOperation(value = "门店积分统计列表", notes = "门店积分统计", tags = {"门店后台"})
+ public R<Page<ShopPoint>> shopstatisticslist(ShopPoint shopPoint,Integer pageNum,Integer pageSize) {
+ Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
+ Page<ShopPoint> page = shopPointService.lambdaQuery().eq(ShopPoint::getShopId, objectId).eq(ShopPoint::getType, shopPoint.getType())
+ .page(Page.of(pageNum, pageSize));
+ return R.ok(page);
+ }
+
/**
* 导出门店积分统计
*/
@@ -56,37 +72,10 @@
ShopPointStatistics statistics = shopPointService.statistics(Page.of(1, Integer.MAX_VALUE), shopPoint);
if (statistics!=null){
IPage<ShopPoint> shopPointIPage = statistics.getShopPointIPage();
- List<ShopPointEX> shopPointEXList = new ArrayList<>();
- if (shopPointIPage!=null){
- List<ShopPoint> records = shopPointIPage.getRecords();
- if (records!=null){
- for (ShopPoint record : records) {
- ShopPointEX shopPointEX = new ShopPointEX();
- BeanUtils.copyBeanProp(shopPointEX, record);
- Integer type = record.getType();
- switch (type) {
- case 1:
- shopPointEX.setType("门店业绩");
- break;
- case 2:
- shopPointEX.setType("门店返佣");
- break;
- default:
- shopPointEX.setType("下级门店返佣");
- break;
- }
- shopPointEXList.add(shopPointEX);
- }
- }
-
- ExcelUtil<ShopPointEX> util = new ExcelUtil<>(ShopPointEX.class);
- util.exportExcel(response, shopPointEXList, "用户积分统计");
- }
+ ExcelUtil<ShopPoint> util = new ExcelUtil<>(ShopPoint.class);
+ util.exportExcel(response, shopPointIPage.getRecords(), "用户积分统计");
}
-
}
-
-
}
--
Gitblit v1.7.1