Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/controller/SysAgencyFeeApprovalController.java

@@ -2,6 +2,7 @@ package com.ydtech.modules.admin.controller;
 
 
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysAgencyFeeApproval;
 import com.ydtech.modules.admin.model.dto.SysAgencyFeeApprovalAddDto;
 import com.ydtech.modules.admin.model.dto.SysAgencyFeeApprovalDto;
@@ -15,6 +16,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -74,6 +76,10 @@ public class SysAgencyFeeApprovalController extends BaseController {
     @ApiOperation(value = "提现申请保存")
     @PostMapping("/add")
     public HttpResult add(@RequestBody SysAgencyFeeApprovalAddDto sysAgencyFeeApprovalAddDto) {
+        BigDecimal cashFee = sysAgencyFeeApprovalAddDto.getCashFee();
+        if (cashFee.equals(new BigDecimal("0.00"))) {
+            throw new SystemException("无可提现金额!");
+        }
         return this.sysAgencyFeeApprovalService.insert(sysAgencyFeeApprovalAddDto);
     }
 

src/main/java/com/ydtech/modules/admin/model/dto/SysAgencyFeeApprovalAddDto.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.admin.model.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -54,6 +55,7 @@ public class SysAgencyFeeApprovalAddDto {
      * 可提现抽成费用
      */
     @ApiModelProperty(value = "可提现抽成费用")
+    @JsonFormat(pattern = "0.00")
     private BigDecimal cashFee;
     /**
      * 提层计算时间