From f9b9131367d9ba6fe852130b12083c0f5ea68bbb Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 27 五月 2024 17:26:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java
index fd0f70a..4e7f6a5 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java
@@ -6,8 +6,13 @@
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.UserRedPacketRecord;
+import com.stylefeng.guns.modular.system.service.IUserRedPacketRecordService;
+import com.stylefeng.guns.modular.system.service.impl.UserServiceImpl;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -19,8 +24,11 @@
import com.stylefeng.guns.modular.system.model.SysRedPacketRecord;
import com.stylefeng.guns.modular.system.service.ISysRedPacketRecordService;
+import java.math.BigDecimal;
+import java.util.Calendar;
import java.util.Date;
import java.util.Map;
+import java.util.Random;
/**
* 控制器
@@ -36,6 +44,9 @@
@Autowired
private ISysRedPacketRecordService sysRedPacketRecordService;
+ @Autowired
+ private IUserRedPacketRecordService userRedPacketRecordService;
+
/**
* 跳转到首页
@@ -43,6 +54,11 @@
@RequestMapping("")
public String index() {
return PREFIX + "sysRedPacketRecord.html";
+ }
+
+ @RequestMapping("/tUser")
+ public String tUser() {
+ return PREFIX + "tUser.html";
}
/**
@@ -64,6 +80,47 @@
return PREFIX + "sysRedPacketRecord_edit.html";
}
+
+ @RequestMapping(value = "/direct")
+ @ResponseBody
+ public ResultUtil direct(String ids, Integer redId) {
+
+ System.err.println("========="+ids+"======="+redId);
+ Double money = 0D;
+
+
+ SysRedPacketRecord sysRedPacketRecord = sysRedPacketRecordService.selectById(redId);
+ if(null != sysRedPacketRecord){
+ Integer type = sysRedPacketRecord.getType();
+ if(type == 1){//固定金额
+ money = Double.valueOf(String.valueOf(sysRedPacketRecord.getMoney()));
+ }else{//随机金额
+ Double startMoney = Double.valueOf(String.valueOf(sysRedPacketRecord.getStartMoney()));
+ Double endMoney = Double.valueOf(String.valueOf(sysRedPacketRecord.getEndMoney()));
+ int i = new BigDecimal(endMoney).subtract(new BigDecimal(startMoney)).intValue();
+ Random random = new Random();
+ int num = random.nextInt(i);
+ money = new BigDecimal(startMoney).add(new BigDecimal(num)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ }
+
+ }
+ String[] split = ids.split(",");
+ for (String s : split) {
+ if(money > 0){
+ //添加临时红包数据
+ UserRedPacketRecord userRedPacketRecord = new UserRedPacketRecord();
+ userRedPacketRecord.setMoney(money);
+ userRedPacketRecord.setInsertTime(new Date());
+ userRedPacketRecord.setCompanyId(1);
+ userRedPacketRecord.setState(0);
+ userRedPacketRecord.setOrderId(null);
+ userRedPacketRecord.setOrderType(3);
+ userRedPacketRecord.setUserId(Integer.valueOf(s));
+ userRedPacketRecordService.insert(userRedPacketRecord);
+ }
+ }
+ return ResultUtil.success();
+ }
/**
* 获取列表
*/
--
Gitblit v1.7.1