From 5588692dbb59c9e67c1b0cf81eb5b3108a484be1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 25 十月 2023 08:38:15 +0800
Subject: [PATCH] 运营商权限
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java | 1 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsQuery.java | 1 +
cloud-server-account/src/main/java/com/dsh/account/model/query/RechargeRecordsQuery.java | 1 +
cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml | 3 +++
4 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/query/RechargeRecordsQuery.java b/cloud-server-account/src/main/java/com/dsh/account/model/query/RechargeRecordsQuery.java
index f0db8f8..67800fe 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/query/RechargeRecordsQuery.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/query/RechargeRecordsQuery.java
@@ -22,4 +22,5 @@
private List<Integer> userIds;
private BigDecimal amount;
private Integer insertType;
+ private Integer objectId;
}
diff --git a/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml b/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml
index 7792f19..8440f3c 100644
--- a/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml
+++ b/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml
@@ -10,6 +10,9 @@
<if test="query.amount!=null and query.amount!= ''">
and t1.amount <= #{query.amount}
</if>
+ <if test="query.objectId!=null and query.objectId!= ''">
+ and t2.addUserId = #{query.objectId}
+ </if>
<if test="query.insertType!=null and query.insertType!= ''">
and t2.insertType = #{query.insertType}
</if>
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 9bfcbd9..e36fd4f 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);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsQuery.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsQuery.java
index 77c4dd9..2ce5945 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsQuery.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsQuery.java
@@ -23,4 +23,5 @@
private List<Integer> userIds;
private BigDecimal amount;
private Integer insertType;
+ private Integer objectId;
}
--
Gitblit v1.7.1