From c8638df756d5c56f2d0c3ed35522fc5a340122c8 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 04 七月 2025 15:12:22 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java
index 1b36386..a6912cf 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java
@@ -4,13 +4,13 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.SinataUtil;
-import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.dao.UserActivityMapper;
+import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -45,38 +45,40 @@
@Autowired
private IUserActivityInviteService userActivityInviteService;
-
+
@Autowired
private IUserActivityRedenvelopeService userActivityRedenvelopeService;
-
+
@Autowired
private IUserActivityRegisteredService userActivityRegisteredService;
-
+
@Autowired
private IUserService userService;
-
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
+
@Override
public void insertOrUpdate(Integer id, String name, String startTime, Integer registCouponId, Integer registEnable, Integer registNumber, Integer registEffective,
Integer inviteCouponId, Integer inviteEnable, Integer inviteNumber, Integer inviteEffective, Integer balanceEnable, String balanceInfo,
Integer discountEnable, Double discountSpecial, Double discountTaxi, Double discountLogistics, Integer redenvelopeId, Integer redenvelopeEnable,
Double registerPrice, Double invitationPrice, Double redPrice) {
- if(id==null){
+ if (id == null) {
String[] timeArray = startTime.split(" - ");
Date startTimes = DateUtil.getDate_str3(timeArray[0]);
Date endTimes = DateUtil.getDate_str3(timeArray[1]);
- ShiroUser user = ShiroKit.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
Date nowDay = new Date();
UserActivity userActivity = new UserActivity();
userActivity.setInsertTime(nowDay);
- userActivity.setCompanyId(ShiroKit.getUser().getObjectId());
- userActivity.setCompanyType(ShiroKit.getUser().getRoleType());
- userActivity.setStatus(userActivity.getCompanyType()==1?3:1);
+ userActivity.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ userActivity.setCompanyType(shiroExtUtil.getUser().getRoleType());
+ userActivity.setStatus(userActivity.getCompanyType() == 1 ? 3 : 1);
userActivity.setName(name);
userActivity.setStartTime(startTimes);
userActivity.setEndTime(endTimes);
userActivity.insertOrUpdate();
//添加注册奖励
- if(registCouponId!=null){
+ if (registCouponId != null) {
UserActivityRegistered userActivityRegistered = new UserActivityRegistered();
userActivityRegistered.setCouponId(registCouponId);
userActivityRegistered.setEnable(registEnable);
@@ -164,29 +166,29 @@
userActivityRedenvelope.setLavePrice(redPrice);
userActivityRedenvelope.insertOrUpdate();
}
- }else{
+ }else {
String[] timeArray = startTime.split(" - ");
Date startTimes = DateUtil.getDate_str3(timeArray[0]);
Date endTimes = DateUtil.getDate_str3(timeArray[1]);
- ShiroUser user = ShiroKit.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
Date nowDay = new Date();
UserActivity userActivity = new UserActivity();
userActivity.setId(id);
userActivity.setInsertTime(nowDay);
- userActivity.setCompanyId(ShiroKit.getUser().getObjectId());
- userActivity.setCompanyType(ShiroKit.getUser().getRoleType());
- userActivity.setStatus(userActivity.getCompanyType()==1?3:1);
+ userActivity.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ userActivity.setCompanyType(shiroExtUtil.getUser().getRoleType());
+ userActivity.setStatus(userActivity.getCompanyType() == 1 ? 3 : 1);
userActivity.setName(name);
userActivity.setStartTime(startTimes);
userActivity.setEndTime(endTimes);
userActivity.insertOrUpdate();
- userActivityBalanceService.delete(new EntityWrapper<UserActivityBalance>().eq("userActivityId",id));
- userActivityDiscount1Service.delete(new EntityWrapper<UserActivityDiscount1>().eq("userActivityId",id));
- userActivityInviteService.delete(new EntityWrapper<UserActivityInvite>().eq("userActivityId",id));
- userActivityRedenvelopeService.delete(new EntityWrapper<UserActivityRedenvelope>().eq("userActivityId",id));
- userActivityRegisteredService.delete(new EntityWrapper<UserActivityRegistered>().eq("userActivityId",id));
+ userActivityBalanceService.delete(new EntityWrapper<UserActivityBalance>().eq("userActivityId", id));
+ userActivityDiscount1Service.delete(new EntityWrapper<UserActivityDiscount1>().eq("userActivityId", id));
+ userActivityInviteService.delete(new EntityWrapper<UserActivityInvite>().eq("userActivityId", id));
+ userActivityRedenvelopeService.delete(new EntityWrapper<UserActivityRedenvelope>().eq("userActivityId", id));
+ userActivityRegisteredService.delete(new EntityWrapper<UserActivityRegistered>().eq("userActivityId", id));
//添加注册奖励
- if(registCouponId!=null){
+ if (registCouponId != null) {
UserActivityRegistered userActivityRegistered = new UserActivityRegistered();
userActivityRegistered.setCouponId(registCouponId);
userActivityRegistered.setEnable(registEnable);
--
Gitblit v1.7.1