From 4e8951a439c03e87568789cedeb62033884412db Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 16 五月 2023 10:24:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java
index 3a4712f..b1cfe52 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java
@@ -55,7 +55,7 @@
private TUserToCouponMapper tUserToCouponMapper;
@Override
- public EntityWrapper<TAgent> getAgentWrapper(String principal, String principalPhone, String createTime) {
+ public EntityWrapper<TAgent> getAgentWrapper(String principal, String principalPhone, String createTime,Integer status) {
EntityWrapper<TAgent> wrapper = new EntityWrapper<>();
// 昵称
if(StringUtils.hasLength(principal)){
@@ -68,14 +68,18 @@
// 开始，结束时间
if(StringUtils.hasLength(createTime)){
String[] split = createTime.split(" - ");
- Date startTime = DateUtil.getDate_str4(split[0]);
- Date endTime = DateUtil.getDate_str4(split[1]);
+ Date startTime = DateUtil.getDate_str3(split[0]+" 00:00:00");
+ Date endTime = DateUtil.getDate_str3(split[1]+" 23:59:59");
wrapper.between("createTime",startTime,endTime);
}
// 判断是否为代理商
if(Objects.requireNonNull(ShiroKit.getUser()).getRoleType() == 3){
wrapper.eq("id",ShiroKit.getUser().getObjectId());
}
+ // 状态
+ if(Objects.nonNull(status)){
+ wrapper.eq("status",status);
+ }
wrapper.ne("status", StatusEnum.DELETE.getCode());
wrapper.orderBy("createTime",false);
return wrapper;
--
Gitblit v1.7.1