From c8b503726415980e5fa9a5ffc0e4e751eb7466e9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 01 八月 2025 11:45:53 +0800
Subject: [PATCH] 新增加三方业务流程代码
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java | 49 ++++++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java
index c515b65..5fd6f3c 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java
@@ -2,32 +2,32 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.SysCouponActivity;
import com.stylefeng.guns.modular.system.model.SysCouponRecord;
import com.stylefeng.guns.modular.system.model.TUser;
import com.stylefeng.guns.modular.system.model.UserCouponRecord;
+import com.stylefeng.guns.modular.system.service.ISysCouponActivityService;
import com.stylefeng.guns.modular.system.service.ISysCouponRecordService;
import com.stylefeng.guns.modular.system.service.ITUserService;
import com.stylefeng.guns.modular.system.util.DateUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
-import com.stylefeng.guns.modular.system.model.SysCouponActivity;
-import com.stylefeng.guns.modular.system.service.ISysCouponActivityService;
+import org.springframework.web.bind.annotation.ResponseBody;
+import javax.annotation.Resource;
import java.util.*;
/**
@@ -39,18 +39,21 @@
@Controller
@RequestMapping("/sysCouponActivity")
public class SysCouponActivityController extends BaseController {
-
+
private String PREFIX = "/system/sysCouponActivity/";
-
+
@Autowired
private ISysCouponActivityService sysCouponActivityService;
-
+
@Autowired
private ITUserService userService;
-
+
@Autowired
private ISysCouponRecordService couponRecordService;
-
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
+
+
/**
* 跳转到首页
*/
@@ -58,7 +61,7 @@
public String index() {
return PREFIX + "sysCouponActivity.html";
}
-
+
/**
* 跳转到选择优惠券页面
* @return
@@ -120,7 +123,7 @@
}
if(SinataUtil.isNotEmpty(couponUseType)){wrapper.eq("couponUseType",couponUseType);}
if(SinataUtil.isNotEmpty(status)){wrapper.eq("status",status);}
- ShiroUser user = ShiroKit.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
if(user.getRoleType()!=1){
wrapper.eq("companyId",user.getObjectId());
wrapper.eq("companyType",user.getRoleType());
@@ -143,14 +146,14 @@
sysCouponActivity.setFullMoney(sysCouponRecord.getFullMoney());
sysCouponActivity.setInsertTime(new Date());
sysCouponActivity.setCouponId(activityId);
- sysCouponActivity.setCompanyId(ShiroKit.getUser().getObjectId());
- sysCouponActivity.setCompanyType(ShiroKit.getUser().getRoleType());
- sysCouponActivity.setStatus(sysCouponActivity.getCompanyType()==1?3:1);
+ sysCouponActivity.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ sysCouponActivity.setCompanyType(shiroExtUtil.getUser().getRoleType());
+ sysCouponActivity.setStatus(sysCouponActivity.getCompanyType() == 1 ? 3 : 1);
sysCouponActivityService.insert(sysCouponActivity);
- if(sysCouponActivity.getCompanyType()==1){
+ if (sysCouponActivity.getCompanyType() == 1) {
//定时发送优惠券
Timer timer = new Timer();
- timer.schedule(new timerTaskTest(sysCouponActivity.getId()),30*1000);//timer.schedule(执行的方法，延迟多久执行(ms))
+ timer.schedule(new timerTaskTest(sysCouponActivity.getId()), 30 * 1000);//timer.schedule(执行的方法，延迟多久执行(ms))
}
return SUCCESS_TIP;
}
@@ -258,9 +261,9 @@
sysCouponActivity.setFullMoney(sysCouponRecord.getFullMoney());
sysCouponActivity.setInsertTime(new Date());
sysCouponActivity.setCouponId(activityId);
- sysCouponActivity.setCompanyId(ShiroKit.getUser().getObjectId());
- sysCouponActivity.setCompanyType(ShiroKit.getUser().getRoleType());
- sysCouponActivity.setStatus(sysCouponActivity.getCompanyType()==1?3:1);
+ sysCouponActivity.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ sysCouponActivity.setCompanyType(shiroExtUtil.getUser().getRoleType());
+ sysCouponActivity.setStatus(sysCouponActivity.getCompanyType() == 1 ? 3 : 1);
sysCouponActivityService.updateById(sysCouponActivity);
return SUCCESS_TIP;
}
--
Gitblit v1.7.1