|
@@ -156,18 +156,19 @@ public class SysDeptRechargeServiceImpl extends ServiceImpl<SysDeptRechargeMappe
|
|
} else {
|
|
} else {
|
|
// 基于 充值金额 计算
|
|
// 基于 充值金额 计算
|
|
// 充值积分 = 充值金额 / (服务费率/100)
|
|
// 充值积分 = 充值金额 / (服务费率/100)
|
|
- BigDecimal rechargeScore =
|
|
|
|
- toRecharge.getRechargeAmount()
|
|
|
|
- .divide(deptRecharge.getServiceCharge().divide(new BigDecimal("100.00")), RoundingMode.HALF_EVEN)
|
|
|
|
- .setScale(0, RoundingMode.UP);
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- if (!toRecharge.getRechargeScore().equals(rechargeScore.longValue())) {
|
|
|
|
- throw new RuntimeException("充值积分不正确");
|
|
|
|
- }
|
|
|
|
|
|
+ //BigDecimal divide = deptRecharge.getServiceCharge().divide(new BigDecimal("100.00"));
|
|
|
|
+ //BigDecimal rechargeScore =
|
|
|
|
+ // toRecharge.getRechargeAmount()
|
|
|
|
+ // .divide(divide, RoundingMode.HALF_EVEN)
|
|
|
|
+ // .setScale(0, RoundingMode.UP);
|
|
|
|
+ //
|
|
|
|
+ //
|
|
|
|
+ //if (toRecharge.getRechargeScore() != rechargeScore.longValue()) {
|
|
|
|
+ // throw new RuntimeException("充值积分不正确");
|
|
|
|
+ //}
|
|
// 计算更新金额
|
|
// 计算更新金额
|
|
// currentBalance = toRecharge.getRechargeAmount().add(deptRecharge.getBalance());
|
|
// currentBalance = toRecharge.getRechargeAmount().add(deptRecharge.getBalance());
|
|
- currentScore = rechargeScore.longValue() + deptRecharge.getScore();
|
|
|
|
|
|
+ currentScore = toRecharge.getRechargeScore() + deptRecharge.getScore();
|
|
// 更新
|
|
// 更新
|
|
boolean update = this.update(Wrappers.<SysDeptRecharge>lambdaUpdate()
|
|
boolean update = this.update(Wrappers.<SysDeptRecharge>lambdaUpdate()
|
|
.eq(SysDeptRecharge::getId, deptRecharge.getId())
|
|
.eq(SysDeptRecharge::getId, deptRecharge.getId())
|