From 3ef388b922400f979788958d9b2823af4fcd7b07 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 22 八月 2023 09:14:01 +0800
Subject: [PATCH] 2.0 新增
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRechargeRecordServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRechargeRecordServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRechargeRecordServiceImpl.java
index 09aff6d..34b328d 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRechargeRecordServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRechargeRecordServiceImpl.java
@@ -13,6 +13,7 @@
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -35,10 +36,19 @@
// 开始，结束时间
if(StringUtils.hasLength(createTime)){
String[] split = createTime.split(" - ");
- startTime = split[0];
- endTime = split[1];
+ startTime = split[0] + " 00:00:00";
+ endTime = split[1] + " 23:59:59";
}
- return tRechargeRecordMapper.userRecharge(startTime,endTime,userName,userPhone,code);
+ Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
+ Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
+ List<TRechargeRecordUserResp> userRecharge = tRechargeRecordMapper.userRecharge(startTime, endTime, userName, userPhone, code);
+ if(3 == roleType){
+ userRecharge = userRecharge.stream().filter(recharge -> recharge.getAgentId().equals(objectId)).collect(Collectors.toList());
+ }
+// if(2 == roleType){
+// userRecharge = userRecharge.stream().filter(recharge -> recharge.getBranchOfficeId().equals(objectId)).collect(Collectors.toList());
+// }
+ return userRecharge;
}
@Override
@@ -48,8 +58,8 @@
// 开始，结束时间
if(StringUtils.hasLength(createTime)){
String[] split = createTime.split(" - ");
- startTime = split[0];
- endTime = split[1];
+ startTime = split[0] + " 00:00:00";
+ endTime = split[1] + " 23:59:59";
}
Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
--
Gitblit v1.7.1