From 1dd3558d3ea498644f51a145b853e56601dec60e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 十二月 2024 16:58:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopPointController.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 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 9833fce..1b6daee 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
@@ -6,12 +6,13 @@
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;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -35,23 +36,42 @@
public class ShopPointController {
@Resource
private ShopPointService shopPointService;
+ @Resource
+ private TokenService tokenService;
/**
* 门店积分统计
*/
@GetMapping("/statistics")
- @ApiModelProperty("门店积分统计")
+ @ApiOperation(value = "门店积分统计")
public R<ShopPointStatistics> statistics(ShopPoint shopPoint) {
ShopPointStatistics statistics = shopPointService.statistics(Page.of(shopPoint.getPageNum(), shopPoint.getPageSize()), shopPoint);
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);
}
/**
* 导出门店积分统计
*/
@GetMapping("/export")
- @ApiModelProperty("导出门店积分统计")
+ @ApiOperation(value = "导出门店积分统计")
public void export(HttpServletResponse response , ShopPoint shopPoint) {
ShopPointStatistics statistics = shopPointService.statistics(Page.of(1, Integer.MAX_VALUE), shopPoint);
if (statistics!=null){
--
Gitblit v1.7.1