From dbcaaa33fdd45c704fd40926df0a542556e8e4f2 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期五, 18 九月 2026 17:15:09 +0800
Subject: [PATCH] feat：门店店长手机号列表展示问题
---
cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
index d90d463..3e0b04e 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
@@ -766,6 +766,7 @@
@ResponseBody
@PostMapping("/student/stuStores")
public HashMap<String, Object> stuStores(@RequestBody List<Integer> ids) {
+ ids = normalizeQueryIds(ids);
HashMap<String, Object> map = new HashMap<>();
List<Integer> activeUserIds = getActiveUserIds(ids);
@@ -983,6 +984,7 @@
@ResponseBody
@PostMapping("/student/userAndVipStore")
public HashMap<String, Object> userAndVipStore(@RequestBody List<Integer> ids) {
+ ids = normalizeQueryIds(ids);
HashMap<String, Object> map = new HashMap<>();
// 所有的
List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>()
@@ -1107,10 +1109,11 @@
if (ToolUtil.isNotEmpty(data)) {
String stime = data.split(" - ")[0] + " 00:00:00";
String etime = data.split(" - ")[1] + " 23:59:59";
- vipPaymentLambdaQueryWrapper.between(VipPayment::getInsertTime, stime, etime);
+ vipPaymentLambdaQueryWrapper.between(VipPayment::getPayTime, stime, etime);
}
vipPaymentLambdaQueryWrapper.in(VipPayment::getAppUserId, ids);
vipPaymentLambdaQueryWrapper.eq(VipPayment::getPayStatus, 2);
+ vipPaymentLambdaQueryWrapper.eq(VipPayment::getState, 1);
List<VipPayment> list = vipPaymentService.list(vipPaymentLambdaQueryWrapper);
double sum = list.stream().mapToDouble(VipPayment::getAmount).sum();
@@ -1120,10 +1123,11 @@
if (ToolUtil.isNotEmpty(data)) {
String stime = data.split(" - ")[0] + " 00:00:00";
String etime = data.split(" - ")[1] + " 23:59:59";
- rechargeRecordsLambdaQueryWrapper.between(RechargeRecords::getInsertTime, stime, etime);
+ rechargeRecordsLambdaQueryWrapper.between(RechargeRecords::getPayTime, stime, etime);
}
rechargeRecordsLambdaQueryWrapper.in(RechargeRecords::getAppUserId, ids);
rechargeRecordsLambdaQueryWrapper.eq(RechargeRecords::getPayStatus, 2);
+ rechargeRecordsLambdaQueryWrapper.eq(RechargeRecords::getState, 1);
List<RechargeRecords> list1 = rechargeRecordsService.list(rechargeRecordsLambdaQueryWrapper);
double sum1 = list1.stream().map(RechargeRecords::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue();
@@ -1202,6 +1206,9 @@
ArrayList<Integer> integers = new ArrayList<>();
for (String string : strings) {
+ if (string.equals("中华人民共和国")) {
+ continue;
+ }
int a = 0;
strings1.add(string);
for (TAppUser tAppUser : list) {
@@ -1348,6 +1355,7 @@
@PostMapping("/student/queryUserAgeStore")
public HashMap<String, Object> queryUserAgeStore(@RequestBody List<Integer> ids) {
+ ids = normalizeQueryIds(ids);
HashMap<String, Object> map = new HashMap<>();
List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().in(TAppUser::getId, ids)
.isNotNull(TAppUser::getPhone)
--
Gitblit v1.7.1