linxk 2 долоо хоног өмнө
parent
commit
8a4728d8f4

+ 2 - 1
cif-service/src/main/java/com/txz/cif/core/ResultCode.java

@@ -64,7 +64,8 @@ public enum ResultCode {
     EFFECTIVE_BALANCE_IS_INSUFFICIENT("1073", "有效余额不足" ),
 
     ADD_RECHARGE_RECORD_EXCEPTION("1074", "创建充值订单失败"),
-    CHANNEL_EXCEPTION("1075", "未支持的通道类型" );
+    CHANNEL_EXCEPTION("1075", "未支持的通道类型" ),
+    AMOUNT_IS_NULL("1076", "金额不能为空,或者为0" );
 
     private final String code;   //状态码
     private final String message;

+ 6 - 3
cif-service/src/main/java/com/txz/cif/web/RechargeRecordApiController.java

@@ -171,9 +171,12 @@ public class RechargeRecordApiController {
     @ApiOperation(value = "创建充值订单", httpMethod = "GET")
     public Result<CreatePayVO> add(@RequestParam BigDecimal amount, @RequestParam Long methodId, HttpServletRequest request) {
         Long userId = authService.getTokenUserId(request);
-        // if (goodsId == null) {
-        //     return ResultGenerator.genFailResult(ResultCode.OAUTH_INVALID_ACCESS_TOKEN);
-        // }
+         if (userId == null) {
+             return ResultGenerator.genFailResult(ResultCode.OAUTH_INVALID_ACCESS_TOKEN);
+         }
+        if (amount == null || amount.compareTo(BigDecimal.ZERO) <= 0) {
+            return ResultGenerator.genFailResult(ResultCode.AMOUNT_IS_NULL);
+        }
         DateTime now = DateUtil.date();
         try {
             // Goods goods = goodsService.findById(goodsId);

+ 4 - 1
cif-service/src/main/java/com/txz/cif/web/WithdrawRecordApiController.java

@@ -101,6 +101,7 @@ public class WithdrawRecordApiController {
             }
             Claims claims = result.getRight();
             Long userId = Long.valueOf(claims.get("userId").toString());
+
             User user = userService.findById(userId);
             if (user == null) {
                 return ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);
@@ -117,7 +118,9 @@ public class WithdrawRecordApiController {
                 user.setBankAccount(param.getBankAccount());
                 user.setBankAccountName(param.getBankAccountName());
             }
-            
+            if (param.getAmount() == null || param.getAmount().compareTo(BigDecimal.ZERO) <= 0) {
+                return ResultGenerator.genFailResult(ResultCode.AMOUNT_IS_NULL);
+            }
             
             com.txz.operating.result.Result<ConfigDTO> openRedEnvelopeRate = operatingConfigDubboServiceClient.getConfigByCode("join_red_envelope_rate");
             String rate = openRedEnvelopeRate.getData().getValueInfo();