From 055bb95f76e7e15cb1cbd5f9b7fe79b41eb30e5e Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 02 七月 2026 19:04:32 +0800
Subject: [PATCH] update
---
cloud-server-competition/src/main/java/com/dsh/competition/model/CompetionVO.java | 1
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java | 24 ++++++++++--
cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java | 4 +-
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java | 4 +-
cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserPointsMerchandiseMapper.java | 2
cloud-server-management/src/main/java/com/dsh/config/RedisConfig.java | 2
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 4 +-
cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetionVO.java | 1
cloud-server-activity/src/main/java/com/dsh/activity/service/UserPointsMerchandiseService.java | 2
cloud-server-competition/src/main/java/com/dsh/config/RedisConfig.java | 2
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 58 +++++++++++++++++++++++++---
11 files changed, 83 insertions(+), 21 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index f251986..0f53331 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -284,8 +284,8 @@
*/
@ResponseBody
@RequestMapping("/base/pointMerchars/getAmount")
- public List<PointMerchandiseIncomeVo> getAmount() {
- return userPointsMerchandiseService.getAmount();
+ public List<PointMerchandiseIncomeVo> getAmount(@RequestBody List<Integer> storeIds) {
+ return userPointsMerchandiseService.getAmount(storeIds);
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserPointsMerchandiseMapper.java b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserPointsMerchandiseMapper.java
index db8de27..7674366 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserPointsMerchandiseMapper.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserPointsMerchandiseMapper.java
@@ -22,7 +22,7 @@
public interface UserPointsMerchandiseMapper extends BaseMapper<UserPointsMerchandise> {
- List<PointMerchandiseIncomeVo> getAmount();
+ List<PointMerchandiseIncomeVo> getAmount(@Param("storeIds") List<Integer> storeIds);
Object changeState(List<Integer> ids, Integer state);
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/UserPointsMerchandiseService.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/UserPointsMerchandiseService.java
index ab0122f..5270105 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/UserPointsMerchandiseService.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/UserPointsMerchandiseService.java
@@ -21,7 +21,7 @@
*/
public interface UserPointsMerchandiseService extends IService<UserPointsMerchandise> {
- List<PointMerchandiseIncomeVo> getAmount();
+ List<PointMerchandiseIncomeVo> getAmount(List<Integer> storeIds);
Object changeState(CourseChangeStateDTO dto);
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java
index 03c44e2..d813d06 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java
@@ -33,8 +33,8 @@
@Override
- public List<PointMerchandiseIncomeVo> getAmount() {
- List<PointMerchandiseIncomeVo> amount = userPointsMerchandiseMapper.getAmount();
+ public List<PointMerchandiseIncomeVo> getAmount(List<Integer> storeIds) {
+ List<PointMerchandiseIncomeVo> amount = userPointsMerchandiseMapper.getAmount(storeIds);
return amount;
}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index 208c8bc..694add2 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -1142,13 +1142,11 @@
// 年
ArrayList<Integer> years = new ArrayList<>();
ArrayList<Integer> yearsUser = new ArrayList<>();
- Integer operatorId = vo.getOperatorId();
- List<Integer> operatorId1 = cttService.list(new QueryWrapper<Competition>().eq("operatorId", operatorId))
- .stream().map(Competition::getId).collect(Collectors.toList());
for (Object o : collect) {
String s = o.toString();
- int count = cttService.count(new LambdaQueryWrapper<Competition>().like(Competition::getInsertTime, s).eq(Competition::getOperatorId, vo.getOperatorId()));
- int count1 = ucttService.count(new LambdaQueryWrapper<UserCompetition>().in(UserCompetition::getAppUserId, vo.getIds()).like(UserCompetition::getInsertTime, s));
+ List<Integer> competitionIds = listCompetitionIds(vo, s);
+ int count = competitionIds.size();
+ int count1 = countUserCompetitions(vo, s, competitionIds);
years.add(count);
yearsUser.add(count1);
}
@@ -1166,8 +1164,9 @@
m = "0" + i;
}
String s = year + "-" + m;
- int count = cttService.count(new LambdaQueryWrapper<Competition>().like(Competition::getInsertTime, s).eq(Competition::getOperatorId, operatorId));
- int count1 = ucttService.count(new LambdaQueryWrapper<UserCompetition>().in(UserCompetition::getAppUserId, vo.getIds()).like(UserCompetition::getInsertTime, s));
+ List<Integer> competitionIds = listCompetitionIds(vo, s);
+ int count = competitionIds.size();
+ int count1 = countUserCompetitions(vo, s, competitionIds);
months.add(count);
monthsUser.add(count1);
}
@@ -1177,6 +1176,51 @@
return map;
}
+ private List<Integer> listCompetitionIds(CompetionVO vo, String dateText) {
+ return cttService.list(buildCompetitionCountWrapper(vo, dateText))
+ .stream()
+ .map(Competition::getId)
+ .collect(Collectors.toList());
+ }
+
+ private int countUserCompetitions(CompetionVO vo, String dateText, List<Integer> competitionIds) {
+ if (competitionIds.isEmpty()) {
+ return 0;
+ }
+ return ucttService.count(new LambdaQueryWrapper<UserCompetition>()
+ .in(UserCompetition::getAppUserId, vo.getIds())
+ .in(UserCompetition::getCompetitionId, competitionIds)
+ .like(UserCompetition::getInsertTime, dateText));
+ }
+
+ private LambdaQueryWrapper<Competition> buildCompetitionCountWrapper(CompetionVO vo, String dateText) {
+ LambdaQueryWrapper<Competition> wrapper = new LambdaQueryWrapper<Competition>()
+ .like(Competition::getInsertTime, dateText)
+ .eq(Competition::getOperatorId, vo.getOperatorId());
+ appendStoreIdFilter(wrapper, vo.getStoreIds());
+ return wrapper;
+ }
+
+ private void appendStoreIdFilter(LambdaQueryWrapper<Competition> wrapper, List<Integer> storeIds) {
+ if (storeIds == null || storeIds.isEmpty()) {
+ return;
+ }
+
+ List<Integer> validStoreIds = storeIds.stream()
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ if (validStoreIds.isEmpty()) {
+ return;
+ }
+
+ wrapper.and(item -> {
+ item.apply("FIND_IN_SET({0}, storeId)", validStoreIds.get(0));
+ for (int i = 1; i < validStoreIds.size(); i++) {
+ item.or().apply("FIND_IN_SET({0}, storeId)", validStoreIds.get(i));
+ }
+ });
+ }
+
@ResponseBody
@PostMapping("/base/competition/queryAppUserId")
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetionVO.java b/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetionVO.java
index 8297b22..306eb63 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetionVO.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetionVO.java
@@ -8,4 +8,5 @@
public class CompetionVO {
private Integer operatorId;
private List<Integer> ids;
+ private List<Integer> storeIds;
}
diff --git a/cloud-server-competition/src/main/java/com/dsh/config/RedisConfig.java b/cloud-server-competition/src/main/java/com/dsh/config/RedisConfig.java
index 746f3c4..ec52584 100644
--- a/cloud-server-competition/src/main/java/com/dsh/config/RedisConfig.java
+++ b/cloud-server-competition/src/main/java/com/dsh/config/RedisConfig.java
@@ -50,7 +50,7 @@
// 是否启用pool的jmx管理功能, 默认true
//Enable JMX management for pool, default is set to true.
jedisPoolConfig.setJmxEnabled(true);
- JedisPool jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout, password);
+ JedisPool jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout, "123456");
return jedisPool;
}
}
diff --git a/cloud-server-management/src/main/java/com/dsh/config/RedisConfig.java b/cloud-server-management/src/main/java/com/dsh/config/RedisConfig.java
index 71f0b4a..8e577e6 100644
--- a/cloud-server-management/src/main/java/com/dsh/config/RedisConfig.java
+++ b/cloud-server-management/src/main/java/com/dsh/config/RedisConfig.java
@@ -51,7 +51,7 @@
//Enable JMX management for pool, default is set to true.
jedisPoolConfig.setJmxEnabled(true);
// JedisPool jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout, "playPai2026test");
- JedisPool jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout, "playPai2026test");
+ JedisPool jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout, "123456");
return jedisPool;
}
}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java
index b29a0a4..1137755 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java
@@ -45,8 +45,8 @@
/**
* 获取积分商票消费金额
*/
- @RequestMapping("/base/pointMerchars/getAmount")
- List<PointMerchandiseIncomeVo> getAmount();
+ @PostMapping("/base/pointMerchars/getAmount")
+ List<PointMerchandiseIncomeVo> getAmount(@RequestBody List<Integer> storeIds);
@PostMapping("/base/pointMerchars/queryGoodsListSearch")
List<Map<String,Object>> getIntegralGoodsListOfSearch(@RequestBody IntegralGoodsOfSearch ofSearch);
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetionVO.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetionVO.java
index 4c26e37..68b5f2a 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetionVO.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetionVO.java
@@ -8,4 +8,5 @@
public class CompetionVO {
private Integer operatorId;
private List<Integer> ids;
+ private List<Integer> storeIds;
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
index 523ef1a..990dbda 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
@@ -136,8 +136,19 @@
@RequestMapping(value = "/getIncomeData")
@ResponseBody
public Object getIncomeData(Integer operatorId,Integer storeId) {
- operatorId = resolveOperatorId(operatorId);
- storeId = resolveStoreId(storeId);
+// operatorId = resolveOperatorId(operatorId);
+// storeId = resolveStoreId(operatorId);
+ Integer objectId = UserExt.getUser().getObjectId();
+ List<Integer> cityManagerId= new ArrayList<>();
+ if(objectId>0){
+ operatorId=objectId;
+ if(storeId==null){
+ cityManagerId= storeService.list(new QueryWrapper<TStore>().eq("cityManagerId", objectId)).stream().map(TStore::getId).collect(Collectors.toList());
+ }else {
+ cityManagerId.add(storeId);
+ }
+
+ }
// 报名课程查询query
RegisterOrderQuery query = new RegisterOrderQuery();
// 充值记录查询query
@@ -164,7 +175,11 @@
}
}else {
List<Integer> list = new ArrayList<>();
+
+
list.add(storeId);
+
+
query.setStoresIds(list);
siteBookingQuery.setStoreIds(list);
competitionQuery.setStoreId(storeId);
@@ -258,7 +273,7 @@
}
// 积分商品
- List<PointMerchandiseIncomeVo> amount = pointMercharsClient.getAmount();
+ List<PointMerchandiseIncomeVo> amount = pointMercharsClient.getAmount(cityManagerId);
for (PointMerchandiseIncomeVo pointMerchandiseIncomeVo : amount) {
IncomeVO temp = new IncomeVO();
if (pointMerchandiseIncomeVo==null) continue;
@@ -1056,8 +1071,9 @@
//门票
- competionVO.setIds(list);
+ competionVO.setIds(list2);
competionVO.setOperatorId(id);
+ competionVO.setStoreIds(collect1);
HashMap<String, Object> map = competitionClient.actYys(competionVO);
List<TStore> lists = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getOperatorId, id));
--
Gitblit v1.7.1