|
|
@@ -1529,12 +1529,6 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
|
|
|
logger.info("红包金额 {},红包商户号 {}", amount, packetParam);
|
|
|
//2025.6.19 红包金额为0的时候
|
|
|
if (amount.compareTo(BigDecimal.ZERO)>0){
|
|
|
- // 检查公司余额是否足够
|
|
|
- Company company = companyMapper.selectCompanyById(param.getCompanyId());
|
|
|
- BigDecimal money = company.getMoney();
|
|
|
- if (money.compareTo(amount) < 0) {
|
|
|
- return R.error("服务商余额不足,请联系群主服务器充值!");
|
|
|
- }
|
|
|
// 发送红包
|
|
|
return sendRedPacketRewardToUser(param, log, config, packetParam, amount);
|
|
|
} else {
|
|
|
@@ -1608,8 +1602,14 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
|
|
|
return R.error("系统异常,请稍后重试");
|
|
|
}
|
|
|
|
|
|
- if (originalMoney.compareTo(BigDecimal.ZERO) < 0) {
|
|
|
- logger.error("服务商余额不足,异常请求参数{}", packetParam);
|
|
|
+ if (originalMoney.compareTo(BigDecimal.ZERO) <= 0) {
|
|
|
+ logger.error("服务商余额不足,当前余额:{},异常请求参数{}", originalMoney, packetParam);
|
|
|
+ return R.error("服务商余额不足,请联系群主服务器充值!");
|
|
|
+ }
|
|
|
+
|
|
|
+ // 检查余额是否足够扣减红包金额
|
|
|
+ if (originalMoney.compareTo(amount) < 0) {
|
|
|
+ logger.error("服务商余额不足,当前余额:{},需要扣减:{},异常请求参数{}", originalMoney, amount, packetParam);
|
|
|
return R.error("服务商余额不足,请联系群主服务器充值!");
|
|
|
}
|
|
|
|
|
|
@@ -1871,8 +1871,14 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
|
|
|
return R.error("系统异常,请稍后重试");
|
|
|
}
|
|
|
|
|
|
- if (originalMoney.compareTo(BigDecimal.ZERO) < 0) {
|
|
|
- logger.error("服务商余额不足,异常请求参数{}", packetParam);
|
|
|
+ if (originalMoney.compareTo(BigDecimal.ZERO) <= 0) {
|
|
|
+ logger.error("服务商余额不足,当前余额:{},异常请求参数{}", originalMoney, packetParam);
|
|
|
+ return R.error("服务商余额不足,请联系群主服务器充值!");
|
|
|
+ }
|
|
|
+
|
|
|
+ // 检查余额是否足够扣减红包金额
|
|
|
+ if (originalMoney.compareTo(amount) < 0) {
|
|
|
+ logger.error("服务商余额不足,当前余额:{},需要扣减:{},异常请求参数{}", originalMoney, amount, packetParam);
|
|
|
return R.error("服务商余额不足,请联系群主服务器充值!");
|
|
|
}
|
|
|
|