From 60f70f7409ec1ece8905e088fb43e0cb0258a70b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 19 十二月 2024 10:10:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index 607cb6c..05e9132 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -12,10 +12,12 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.domain.ShopScore;
+import com.ruoyi.other.mapper.ShopMapper;
import com.ruoyi.other.service.ShopScoreService;
import com.ruoyi.other.service.ShopService;
import com.ruoyi.other.vo.NearbyShopVO;
import com.ruoyi.other.vo.ShopDetailVO;
+import com.ruoyi.other.vo.ShopStatistics;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
@@ -55,6 +57,8 @@
private TokenService tokenService;
@Resource
private SysUserClient sysUserClient;
+ @Resource
+ private ShopMapper shopMapper;
@@ -71,7 +75,6 @@
shop.setShopPoint(0);
shop.setSharePoint(0);
shop.setServerPoint(0);
- shop.setLowerLevelRebatePoints(0);
shop.setUsePoint(0);
shop.setGiveawayAllMoney(BigDecimal.ZERO);
shop.setGiveawayMoney(BigDecimal.ZERO);
@@ -273,5 +276,15 @@
return R.ok(list.stream().map(Shop::getId).collect(Collectors.toSet()));
}
+ /**
+ * 门店统计
+ */
+ @GetMapping("/shopStatistics")
+ @ApiOperation(value = "门店统计", tags = {"管理后台-首页统计"})
+ public R<ShopStatistics> shopStatistics(@ApiParam("门店名称") String shopName) {
+ ShopStatistics shopStatistics = shopMapper.getShopStatistics(shopName);
+ return R.ok(shopStatistics);
+ }
+
}
--
Gitblit v1.7.1