6729 在钱包管理中提现0.005，在记录中会被记录成0.01

2025-07-09 17:35:36 +08:00 · 2025-07-09 17:35:36 +08:00 · e3fee8da6d
parent 725195c76e
commit e3fee8da6d
6 changed files with 40 additions and 32 deletions
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccInfoController.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccInfoController.java
@ -185,6 +185,9 @@ public class AccInfoController extends BaseController {
    @ApiOperation("单人充值")
    @PostMapping("/recharge")
    public AjaxResult individualAccRechargeA(@RequestBody @Valid AccRechargeParam param) {
+        if (param.getAmount().scale() > 0 && param.getAmount().stripTrailingZeros().scale() > 0) {
+            throw new ServiceException("金额必须到分");
+        }
        this.accInfoService.individualAccRecharge(param);
        return AjaxResult.success();
    }
@ -192,6 +195,9 @@ public class AccInfoController extends BaseController {
    @ApiOperation("单人取钱")
    @PostMapping("/withdraw")
    public AjaxResult individualAccWithdraw(@RequestBody @Valid AccWithdrawParam param) {
+        if (param.getAmount().scale() > 0 && param.getAmount().stripTrailingZeros().scale() > 0) {
+            throw new ServiceException("金额必须到分");
+        }
        this.accInfoService.individualAccWithdraw(param);
        return AjaxResult.success();
    }
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccSubsidyController.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccSubsidyController.java
@ -4,6 +4,7 @@ import com.bonus.canteen.core.account.constants.AccTradeTypeEnum;
 import com.bonus.canteen.core.account.constants.AccWalletTypeEnum;
 import com.bonus.canteen.core.account.domain.param.*;
 import com.bonus.canteen.core.account.service.AccSubService;
+import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.web.controller.BaseController;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.core.web.page.TableDataInfo;
@ -32,6 +33,9 @@ public class AccSubsidyController extends BaseController {
    @ApiOperation("单人补贴")
    @PostMapping("/add")
    public AjaxResult individualAccSubsidyAdd(@RequestBody @Valid AccSubsidyAddParam param) {
+        if (param.getAmount().scale() > 0 && param.getAmount().stripTrailingZeros().scale() > 0) {
+            throw new ServiceException("金额必须到分");
+        }
        this.accSubService.individualAccSubsidyAdd(param);
        return AjaxResult.success();
    }
@ -46,12 +50,18 @@ public class AccSubsidyController extends BaseController {
    @ApiOperation("批量补贴")
    @PostMapping("/batch/add")
    public AjaxResult batchAccSubsidyAdd(@RequestBody @Valid AccSubsidyBatchAddParam param) {
+        if (param.getAmount().scale() > 0 && param.getAmount().stripTrailingZeros().scale() > 0) {
+            throw new ServiceException("金额必须到分");
+        }
        this.accSubService.batchAccSubsidyAdd(param);
        return AjaxResult.success();
    }
    @ApiOperation("批量补贴校验")
    @PostMapping("/batch/add/check")
    public AjaxResult batchAccSubsidyAddCheck(@RequestBody @Valid AccSubsidyBatchAddParam param) {
+        if (param.getAmount().scale() > 0 && param.getAmount().stripTrailingZeros().scale() > 0) {
+            throw new ServiceException("金额必须到分");
+        }
        return AjaxResult.success(accSubService.batchOperationWalletAddCheck(param));
    }
    @ApiOperation("批量补贴清空")
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccRechargeParam.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccRechargeParam.java
@ -4,9 +4,7 @@ import com.bonus.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.*;
 import java.math.BigDecimal;

@Data
@ -20,11 +18,11 @@ public class AccRechargeParam extends BaseEntity {
    )
    private @NotNull(
            message = "金额不能为空"
-    ) @Max(
-            value = 10000000L,
+    ) @DecimalMax(
+            value = "10000000",
            message = "超过最大金额限制"
-    ) @Min(
-            value = 1L,
-            message = "小于最小充值金额"
+    ) @DecimalMin(
+            value = "1",
+            message = "最小充值金额为1分"
    ) BigDecimal amount;
 }
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccSubsidyAddParam.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccSubsidyAddParam.java
@ -4,9 +4,7 @@ import com.bonus.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.*;
 import java.math.BigDecimal;

@Data
@ -20,11 +18,11 @@ public class AccSubsidyAddParam extends BaseEntity {
    )
    private @NotNull(
            message = "金额不能为空"
-    ) @Max(
-            value = 10000000L,
+    ) @DecimalMax(
+            value = "10000000",
            message = "超过最大金额限制"
-    ) @Min(
-            value = 1L,
-            message = "小于最小充值金额"
+    ) @DecimalMin(
+            value = "1",
+            message = "最小充值金额为1分"
    ) BigDecimal amount;
 }
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccSubsidyBatchAddParam.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccSubsidyBatchAddParam.java
@ -4,9 +4,7 @@ import com.bonus.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.*;
 import java.math.BigDecimal;
 import java.util.List;

@ -24,11 +22,11 @@ public class AccSubsidyBatchAddParam extends BaseEntity {
    )
    private @NotNull(
            message = "金额不能为空"
-    ) @Max(
-            value = 10000000L,
+    ) @DecimalMax(
+            value = "10000000",
            message = "超过最大金额限制"
-    ) @Min(
-            value = 1L,
-            message = "小于最小充值金额"
+    ) @DecimalMin(
+            value = "1",
+            message = "最小充值金额为1分"
    ) BigDecimal amount;
 }
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccWithdrawParam.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccWithdrawParam.java
@ -4,9 +4,7 @@ import com.bonus.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.*;
 import java.math.BigDecimal;

@Data
@ -21,12 +19,12 @@ public class AccWithdrawParam extends BaseEntity {
    private @NotNull(
            message = "提现金额不能为空"
    )
-    @Min(
-            value = 0L,
-            message = "提现不能小于0"
+    @DecimalMin(
+            value = "1",
+            message = "提现不能小于1分"
    )
-    @Max(
-            value = 9999999999L,
+    @DecimalMax(
+            value = "9999999999",
            message = "超过最大金额限制"
    )
    BigDecimal amount;