feat: 去掉余额充值-金额的相关字段

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/entity/SysDeptRecharge.java

@@ -50,10 +50,10 @@ public class SysDeptRecharge implements Serializable {
      */
     private BigDecimal serviceCharge;
 
-    /**
-     * 可透支金额
-     */
-    private BigDecimal overdrawAmount;
+//    /**
+//     * 可透支金额
+//     */
+//    private BigDecimal overdrawAmount;
 
     /**
      * 可透支积分

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/service/impl/SysDeptRechargeServiceImpl.java

@@ -110,7 +110,11 @@ public class SysDeptRechargeServiceImpl extends ServiceImpl<SysDeptRechargeMappe
                         .multiply(BigDecimal.valueOf(deptRecharge.getScore())).setScale(2, RoundingMode.HALF_EVEN);
                 deptRechargeVO.setBalance(balance);
                 deptRechargeVO.setServiceCharge(deptRecharge.getServiceCharge());
-                deptRechargeVO.setOverdrawAmount(deptRecharge.getOverdrawAmount());
+
+                // 金额 = 积分 * （服务费率/100）
+                BigDecimal overdrawAmount = deptRecharge.getServiceCharge().divide(new BigDecimal("100.00"))
+                        .multiply(BigDecimal.valueOf(deptRecharge.getOverdrawScore())).setScale(2, RoundingMode.HALF_EVEN);
+                deptRechargeVO.setOverdrawAmount(overdrawAmount);
                 deptRechargeVO.setOverdrawScore(deptRecharge.getOverdrawScore());
                 deptRechargeVO.setPermissions(deptRecharge.getPermissions());
                 // 根据充值记录计算
@@ -223,7 +227,7 @@ public class SysDeptRechargeServiceImpl extends ServiceImpl<SysDeptRechargeMappe
             deptRecharge.setDeptId(toConfig.getDeptId());
             deptRecharge.setServiceCharge(toConfig.getServiceCharge());
             deptRecharge.setOverdrawScore(toConfig.getOverdrawScore());
-            deptRecharge.setOverdrawAmount(overdrawAmount);
+//            deptRecharge.setOverdrawAmount(overdrawAmount);
             deptRecharge.setPermissions(toConfig.getPermissions());
             deptRecharge.setScore(0);
 //            deptRecharge.setBalance(BigDecimal.ZERO);
@@ -237,7 +241,7 @@ public class SysDeptRechargeServiceImpl extends ServiceImpl<SysDeptRechargeMappe
                     .set(SysDeptRecharge::getVersion, deptRecharge.getVersion() + 1)
                     .set(SysDeptRecharge::getServiceCharge, toConfig.getServiceCharge())
                     .set(SysDeptRecharge::getOverdrawScore, toConfig.getOverdrawScore())
-                    .set(SysDeptRecharge::getOverdrawAmount, overdrawAmount)
+//                    .set(SysDeptRecharge::getOverdrawAmount, overdrawAmount)
                     .set(SysDeptRecharge::getPermissions, toConfig.getPermissions())
                     .set(SysDeptRecharge::getUpdateTime, LocalDateTime.now())
                     .set(SysDeptRecharge::getUpdateUser, operator));