From e030255c23c7ba3e2cbad1036a810d6d72fa864f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 26 十月 2023 18:04:58 +0800
Subject: [PATCH] 修改bug
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
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 e712d61..cfcfb40 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
@@ -150,6 +150,7 @@
query.setInsertType(roleType);
competitionQuery.setInsertType(roleType);
incomeQuery.setInsertType(roleType);
+ rechargeRecordsQuery.setObjectId(UserExt.getUser().getObjectId());
List<IncomeVO> incomeVOS = new ArrayList<>();
// 会员支付记录
List<VipPayment> vipPayments = vipPaymentClient.registrationList(incomeQuery);
@@ -190,6 +191,11 @@
if (registerOrderVO.getPayStatus()==2){
incomeVOS.add(temp);
}
+ }
+ // query权限设置 获取运营商下的门店集合
+
+ if (roleType==2){
+ competitionQuery.setOperatorId(UserExt.getUser().getObjectId());
}
// 报名活动
List<PaymentCompetition> competitions = competitionClient.listAllPayment(competitionQuery);
@@ -859,7 +865,7 @@
@RequestMapping(value = "/courseYys")
@ResponseBody
public Object courseYys(Integer id) {
- List<Integer> userPt = appUserClient.getUserPt(Arrays.asList(id));
+ List<Integer> userPt = appUserClient.getUserYYs(id);
HashMap<String, Object> map = coursePackagePaymentClient.coursePt(userPt);
return map;
}
--
Gitblit v1.7.1