From 9495425698ee25afa66e648a26404c0b7181ce4e Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 31 七月 2025 10:10:14 +0800
Subject: [PATCH] 推广收益
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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 5364097..bf0712f 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,14 +4,13 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
-import com.stylefeng.guns.core.shiro.ShiroKit;
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;
@@ -46,31 +45,33 @@
@Autowired
private IUserActivityInviteService userActivityInviteService;
-
+
@Autowired
private IUserActivityRedenvelopeService userActivityRedenvelopeService;
-
+
@Autowired
private IUserActivityRegisteredService userActivityRegisteredService;
-
+
@Autowired
private IUserService userService;
-
+ @Autowired
+ 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 = ShiroExtUtil.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
Date nowDay = new Date();
UserActivity userActivity = new UserActivity();
userActivity.setInsertTime(nowDay);
- userActivity.setCompanyId(ShiroExtUtil.getUser().getObjectId());
- userActivity.setCompanyType(ShiroExtUtil.getUser().getRoleType());
+ userActivity.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ userActivity.setCompanyType(shiroExtUtil.getUser().getRoleType());
userActivity.setStatus(userActivity.getCompanyType() == 1 ? 3 : 1);
userActivity.setName(name);
userActivity.setStartTime(startTimes);
@@ -169,13 +170,13 @@
String[] timeArray = startTime.split(" - ");
Date startTimes = DateUtil.getDate_str3(timeArray[0]);
Date endTimes = DateUtil.getDate_str3(timeArray[1]);
- ShiroUser user = ShiroExtUtil.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
Date nowDay = new Date();
UserActivity userActivity = new UserActivity();
userActivity.setId(id);
userActivity.setInsertTime(nowDay);
- userActivity.setCompanyId(ShiroExtUtil.getUser().getObjectId());
- userActivity.setCompanyType(ShiroExtUtil.getUser().getRoleType());
+ userActivity.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ userActivity.setCompanyType(shiroExtUtil.getUser().getRoleType());
userActivity.setStatus(userActivity.getCompanyType() == 1 ? 3 : 1);
userActivity.setName(name);
userActivity.setStartTime(startTimes);
@@ -187,7 +188,7 @@
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