From 1b19574d0726d8982349fad29b736c3dc95a8e13 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 22 七月 2024 10:04:17 +0800
Subject: [PATCH] 7.22
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 f1a1590..a83192a 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
@@ -102,7 +102,22 @@
Integer type = sysRedPacketRecord.getType();
if(type == 1){//固定金额
money = Double.valueOf(String.valueOf(sysRedPacketRecord.getMoney()));
- }else{//随机金额
+ }
+
+// 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){
+ if (sysRedPacketRecord.getType()!=1){
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();
@@ -110,19 +125,16 @@
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.setRemainingAmount(money);
userRedPacketRecord.setInsertTime(new Date());
userRedPacketRecord.setCompanyId(1);
userRedPacketRecord.setState(0);
userRedPacketRecord.setOrderId(null);
- userRedPacketRecord.setOrderType(3);
+ userRedPacketRecord.setRedPacketActivityId(redId);
+// userRedPacketRecord.setOrderType(3);
userRedPacketRecord.setUserId(Integer.valueOf(s));
userRedPacketRecordService.insert(userRedPacketRecord);
}
--
Gitblit v1.7.1