From f788ffdf2005e5563c337f9091448964ef6d2a24 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 02 六月 2023 02:33:55 +0800
Subject: [PATCH] 添加注册商户功能
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java
index e38c646..0e38599 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java
@@ -91,8 +91,8 @@
// 开始，结束时间
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("create_time",startTime,endTime);
}
wrapper.ne("status", StatusEnum.DELETE.getCode());
@@ -235,7 +235,11 @@
tUserToCoupon.setExpireTime(expireTime);
// 添加发放人id和类型
- tUserToCoupon.setObjectId(ShiroKit.getUser().getObjectId());
+ if(ShiroKit.getUser().getRoleType() == 1){
+ tUserToCoupon.setObjectId(1);
+ }else {
+ tUserToCoupon.setObjectId(ShiroKit.getUser().getObjectId());
+ }
tUserToCoupon.setRoleType(ShiroKit.getUser().getRoleType());
tUserToCoupons.add(tUserToCoupon);
--
Gitblit v1.7.1