From adf2ede692b76cf95d0cec80f4087e52d760b219 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 29 九月 2024 17:21:56 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 f2c516c..eeec482 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
@@ -120,7 +120,7 @@
money = Double.valueOf(String.valueOf(sysRedPacketRecord.getMoney()));
//计算剩余金额是否够
- if (v-money*ids.split(",").length <= 0){
+ if (v-money*ids.split(",").length < 0){
return ResultUtil.error("当前红包剩余金额不足");
}
@@ -146,10 +146,16 @@
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);
+ int num;
+ if (!startMoney.equals(endMoney)){
+ num = random.nextInt(i);
+
+ }else {
+ num = 0;
+ }
money = new BigDecimal(startMoney).add(new BigDecimal(num)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
v=v-money;
- if (v<=0){
+ if (v<0){
return ResultUtil.success("当前红包为随机红包，可能有部分用户无法领取",null,"当前红包为随机红包，可能有部分用户无法领取");
}
}
@@ -161,6 +167,8 @@
userRedPacketRecord.setCompanyId(1);
userRedPacketRecord.setState(1);
userRedPacketRecord.setOrderId(null);
+ // 标记为后台发放的红包
+ userRedPacketRecord.setIsGrant(1);
userRedPacketRecord.setRedPacketActivityId(redId);
// userRedPacketRecord.setOrderType(3);
userRedPacketRecord.setUserId(Integer.valueOf(s));
@@ -173,9 +181,6 @@
}catch (Exception e){
e.printStackTrace();
}
-
-
-
}
}
return ResultUtil.success("指派成功",null,"当前红包为随机红包，可能有部分用户无法领取");
--
Gitblit v1.7.1