Merge remote-tracking branch 'origin/master'

# Conflicts:
#	cif-service/src/main/java/com/txz/cif/web/RechargeRecordApiController.java

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

@@ -10,10 +10,10 @@ public enum ResultCode {
     /**
      * 系统错误
      */
-    SUCCESS("200", "成功"),//成功
-    FAIL("400", "失败"),//失败
-    UNAUTHORIZED("401", "未认证（签名错误）"),//未认证（签名错误）
-    NOT_FOUND("404", "接口不存在"),//接口不存在
+    SUCCESS("200", "成功"),// 成功
+    FAIL("400", "失败"),// 失败
+    UNAUTHORIZED("401", "未认证（签名错误）"),// 未认证（签名错误）
+    NOT_FOUND("404", "接口不存在"),// 接口不存在
     INTERNAL_SERVER_ERROR("500", "服务器内部错误"),
     PERMISSION_NOT_HAS("409", "没有操作权限"),
     BACKSTAGE_IS_ERROR("501", "网关异常"),
@@ -38,63 +38,70 @@ public enum ResultCode {
     APPCODE_IS_NULL("1005", "应用编号不能为空"),
     STATUS_IS_NULL("1013", "状态异常"),
     ACCOUNT_IS_NULL("1051", "账号不能为空"),
-    HOSPITAL_IS_NULL("1052", "医院不能为空" ),
-    SETTLEPLANID_IS_NULL("1053", "请选择结算方案" ),
-    ALIASES_IS_HAVE("1054", "科目别名已存在" ),
+    HOSPITAL_IS_NULL("1052", "医院不能为空"),
+    SETTLEPLANID_IS_NULL("1053", "请选择结算方案"),
+    ALIASES_IS_HAVE("1054", "科目别名已存在"),
     SUBJECTTYPE_IS_ERROR("1055", "科目类型异常"),
     SETTLE_HAVE_DATA("1056", "已有结算数据，请联系管理员"),
-    AMOUNT_IS_INSUFFICIENT("1057", "账户金额不足，请联系管理员" ),
+    AMOUNT_IS_INSUFFICIENT("1057", "账户金额不足，请联系管理员"),
     ALIASES_IS_ERROR("1058", "您输入的科目别名有误，请输入非重复别名，例：109"),
-    ENDTIME_ERROR("1059", "您输入的结束时间不能大于昨天" ),
-    STARTTIME_ERROR("1060", "您输入的开始时间早于系统建立之初" ),
-    UNBINDING_NOT_SLEF("1061", "无法解绑群主"  ),
-    USER_STATUS_IS_ERROR("1062", "用户状态异常，请联系管理员"  ),
-    PAY_TYPE_IS_ERROR("1063", "未知的支付类型，请联系管理员"  ),
-    SIGN_ERROR("1064", "签名错误，请联系管理员" ),
-    HOSPITAL_DEVICE_IS_NULL("1065", "医院插件未安装，请联系管理员" ),
-    APPID_IS_NULL("1066", "该设备未配置商户appid，请联系管理员" ),
-
-    UKEY_IS_NULL("2000", "Ukey未找到，请联系管理员"  ),
-    UKEY_IS_SOLD("2001", "Ukey已售出，请联系管理员" ),
-    USERID_IS_ERROR("1067", "用户id异常" ),
+    ENDTIME_ERROR("1059", "您输入的结束时间不能大于昨天"),
+    STARTTIME_ERROR("1060", "您输入的开始时间早于系统建立之初"),
+    UNBINDING_NOT_SLEF("1061", "无法解绑群主"),
+    USER_STATUS_IS_ERROR("1062", "用户状态异常，请联系管理员"),
+    PAY_TYPE_IS_ERROR("1063", "未知的支付类型，请联系管理员"),
+    SIGN_ERROR("1064", "签名错误，请联系管理员"),
+    HOSPITAL_DEVICE_IS_NULL("1065", "医院插件未安装，请联系管理员"),
+    APPID_IS_NULL("1066", "该设备未配置商户appid，请联系管理员"),
+    
+    UKEY_IS_NULL("2000", "Ukey未找到，请联系管理员"),
+    UKEY_IS_SOLD("2001", "Ukey已售出，请联系管理员"),
+    USERID_IS_ERROR("1067", "用户id异常"),
     LOGINACCOUNT_IS_NULL("1068", "登录账号不能为空"),
-    ORG_IS_NULL("1069", "组织机构未找到" ),
+    ORG_IS_NULL("1069", "组织机构未找到"),
     USER_IS_EXIST("7008", "用户已注册"), CODE_CHECK_FAIL("1070", "验证码校验失败"),
-    BANK_IS_NULL("1071", "提现银行不能为空" ), REVIEW_IS_NULL("1072", "审核内容为空"),
-    EFFECTIVE_BALANCE_IS_INSUFFICIENT("1073", "有效余额不足" );
-
-    private final String code;   //状态码
+    BANK_IS_NULL("1071", "提现银行不能为空"), REVIEW_IS_NULL("1072", "审核内容为空"),
+    EFFECTIVE_BALANCE_IS_INSUFFICIENT("1073", "有效余额不足"),
+    
+    ADD_RECHARGE_RECORD_EXCEPTION("1074", "创建充值订单失败"),
+    CHANNEL_EXCEPTION("1075", "未支持的通道类型"),
+    AMOUNT_IS_NULL("1076", "金额不能为空，或者为0"),
+    AMOUNT_OUT_MAX("1076", "金额超限"),
+    ;
+    
+    private final String code;   // 状态码
     private final String message;
-
+    
     ResultCode(String code, String message) {
         this.code = code;
         this.message = message;
     }
-
+    
     public String code() {
         return code;
     }
-
+    
     public String message() {
         return message;
     }
-
+    
     public String getCode() {
         return code;
     }
-
+    
     public String getMessage() {
         String msg = LocalUtil.get(this.name());
-        if (StrUtil.isNotBlank(msg) ){
-           return msg;
+        if (StrUtil.isNotBlank(msg)) {
+            return msg;
         }
         return message;
     }
-
+    
     /**
      * 通过状态码获取ENUM的名字
      *
      * @param code
+     *
      * @return
      */
     public static ResultCode getEnumByStatusCode(String code) {
@@ -103,7 +110,7 @@ public enum ResultCode {
                 return p;
             }
         }
-
+        
         return null;
     }
 }

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

@@ -15,10 +15,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.txz.cif.configurer.LocalUtil;
 import com.txz.cif.constants.MyConstants;
-import com.txz.cif.core.AuthService;
-import com.txz.cif.core.Result;
-import com.txz.cif.core.ResultCode;
-import com.txz.cif.core.ResultGenerator;
+import com.txz.cif.core.*;
 import com.txz.cif.dto.BizLogDTO;
 import com.txz.cif.dto.tfpay.CheckSignDTO;
 import com.txz.cif.dto.tfpay.TFCreateOrderDTO;
@@ -32,7 +29,6 @@ import com.txz.cif.web.para.RecordParam;
 import com.txz.cif.web.ro.TFPayNotifyDTO;
 import com.txz.cif.web.vo.CreatePayVO;
 import com.txz.cif.web.vo.PaymentPriceVO;
-import com.txz.core.ServiceException;
 import com.txz.mall.enums.NoticeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -99,8 +95,7 @@ public class RechargeRecordApiController {
     @ApiOperation(value = "充值商品", httpMethod = "GET")
     public Result<PaymentPriceVO> goodsList(@PathVariable("methodId") Long methodId) {
         Condition c = new Condition(Goods.class);
-        c.createCriteria().andEqualTo("status", 1);
-        c.createCriteria().andEqualTo("methodId", methodId);
+        c.createCriteria().andEqualTo("status", 1).andEqualTo("methodId", methodId);
         c.setOrderByClause("amount asc");
         List<Goods> goods = goodsService.findByCondition(c);
         
@@ -176,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);

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

@@ -3,6 +3,7 @@ package com.txz.cif.web;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.lock.LockInfo;
 import com.baomidou.lock.LockTemplate;
@@ -80,10 +81,11 @@ public class WithdrawRecordApiController {
     
     @Resource
     private OperatingConfigDubboServiceClient operatingConfigDubboServiceClient;
-
-
+    
+    
     @Resource
     private NoticeDubboServiceClient noticeDubboServiceClient;
+    
     @PostMapping("/add")
     @ApiOperation(value = "新增提现订单", httpMethod = "POST")
     public Result add(@RequestBody WithdrawParam param, @RequestHeader(value = X_CLIENT_TOKEN, required = false) String token) {
@@ -101,6 +103,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 +120,15 @@ public class WithdrawRecordApiController {
                 user.setBankAccount(param.getBankAccount());
                 user.setBankAccountName(param.getBankAccountName());
             }
-            
+            if (ObjectUtil.isEmpty(param.getAmount())) {
+                return ResultGenerator.genFailResult(ResultCode.AMOUNT_IS_NULL);
+            }
+            if (param.getAmount().compareTo(BigDecimal.ZERO) <= 0) {
+                return ResultGenerator.genFailResult(ResultCode.AMOUNT_IS_NULL);
+            }
+            if (param.getAmount().compareTo(new BigDecimal(20000)) > 0) {
+                return ResultGenerator.genFailResult(ResultCode.AMOUNT_OUT_MAX);
+            }
             
             com.txz.operating.result.Result<ConfigDTO> openRedEnvelopeRate = operatingConfigDubboServiceClient.getConfigByCode("join_red_envelope_rate");
             String rate = openRedEnvelopeRate.getData().getValueInfo();
@@ -279,7 +290,7 @@ public class WithdrawRecordApiController {
                 withdrawRecordService.success(record, DateUtil.parse(dto.getDatetime(), "yyyyMMddHHmmss"));
                 if (record.getAccountType() == 1) {
                     ne = NoticeEnum.MONEY_WITHDRAWAL_WALLET_SUCCESS;
-                } else  if (record.getAccountType() == 2) {
+                } else if (record.getAccountType() == 2) {
                     ne = NoticeEnum.MONEY_WITHDRAWAL_ACCOUNT_SUCCESS;
                 }
             } else {
@@ -303,8 +314,8 @@ public class WithdrawRecordApiController {
                 
             }
             try {
-                noticeDubboServiceClient.addMoneyNotice(ne,record.getUserId());
-            }catch (Exception e) {
+                noticeDubboServiceClient.addMoneyNotice(ne, record.getUserId());
+            } catch (Exception e) {
                 log.error("新增提现回调消息失败", e);
             }
             return "OK";

cif-service/src/main/java/com/txz/cif/web/mng/ReportController.java

@@ -64,12 +64,18 @@ public class ReportController extends AbstractApiController {
             Condition c = new Condition(User.class);
             c.createCriteria().andLessThanOrEqualTo("createTime",query.getDay()+" 23:59:59");
             Integer num = userService.countByCondition(c);
+            if (num == null || num == 0){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(BigDecimal.valueOf(num));
         } else  if (query.getType() == 2){
             Condition  c = new Condition(User.class);
             c.createCriteria().andLessThanOrEqualTo("createTime",query.getDay()+" 23:59:59")
                     .andGreaterThanOrEqualTo("createTime",query.getDay()+" 00:00:00");
             Integer num = userService.countByCondition(c);
+            if (num == null || num == 0){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(BigDecimal.valueOf(num));
         } else if (query.getType() == 3){
             Condition  c = new Condition(User.class);
@@ -78,6 +84,9 @@ public class ReportController extends AbstractApiController {
             c.createCriteria().andLessThanOrEqualTo("lastLoginTime",date)
                     .andGreaterThanOrEqualTo("lastLoginTime",day7);
             Integer num = userService.countByCondition(c);
+            if (num == null || num == 0){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(BigDecimal.valueOf(num));
         } else if (query.getType() == 4){
             HashMap map = new HashMap();
@@ -85,6 +94,9 @@ public class ReportController extends AbstractApiController {
             map.put("startTime",query.getDay()+" 00:00:00");
             map.put("endTime",query.getDay()+" 23:59:59");
             Integer num = rechargeRecordService.countByUserId(map);
+            if (num == null || num == 0){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(BigDecimal.valueOf(num));
         } else if (query.getType() == 5){
             HashMap map = new HashMap();
@@ -92,6 +104,9 @@ public class ReportController extends AbstractApiController {
             map.put("startTime",query.getDay()+" 00:00:00");
             map.put("endTime",query.getDay()+" 23:59:59");
             Integer num = flowService.countByUserId(map);
+            if (num == null || num == 0){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(BigDecimal.valueOf(num));
         } else if (query.getType() == 6){
             HashMap map = new HashMap();
@@ -99,6 +114,9 @@ public class ReportController extends AbstractApiController {
             map.put("startTime",query.getDay()+" 00:00:00");
             map.put("endTime",query.getDay()+" 23:59:59");
             Integer num = withdrawRecordService.countByUserId(map);
+            if (num == null || num == 0){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(BigDecimal.valueOf(num));
         } else if (query.getType() == 9){
             //充值总金额
@@ -108,12 +126,18 @@ public class ReportController extends AbstractApiController {
             map.put("endTime",query.getDay()+" 23:59:59");
             // 执行查询，返回一个包含求和结果的对象列表
             BigDecimal sum = rechargeRecordService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(sum);
         } else if (query.getType() == 8){
             Condition c = new Condition(RechargeRecord.class);
             c.createCriteria().andLessThanOrEqualTo("createTime",query.getDay()+" 23:59:59")
                     .andGreaterThanOrEqualTo("createTime",query.getDay()+" 00:00:00");
             Integer num = userService.countByCondition(c);
+            if (num == null || num == 0){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(BigDecimal.valueOf(num));
         } else if (query.getType() == 10){
             //充值成功率
@@ -123,6 +147,9 @@ public class ReportController extends AbstractApiController {
                     .andGreaterThanOrEqualTo("createTime",query.getDay()+" 00:00:00");
             // 执行查询，返回一个包含求和结果的对象列表
             Integer count = rechargeRecordService.countByCondition(c);
+            if (count == 0){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             c = new Condition(RechargeRecord.class);
             c.createCriteria()
                     .andLessThanOrEqualTo("createTime",query.getDay()+" 23:59:59")
@@ -141,6 +168,9 @@ public class ReportController extends AbstractApiController {
             map.put("startTime",query.getDay()+" 00:00:00");
             map.put("endTime",query.getDay()+" 23:59:59");
             BigDecimal sum = rechargeRecordService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             //充值订单数
             Condition c = new Condition(RechargeRecord.class);
             c.createCriteria().andEqualTo("status",2)
@@ -159,6 +189,9 @@ public class ReportController extends AbstractApiController {
             map.put("endTime",query.getDay()+" 23:59:59");
             // 执行查询，返回一个包含求和结果的对象列表
             BigDecimal sum = withdrawRecordService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(sum);
         } else if (query.getType() == 13){
             //提现订单数
@@ -167,6 +200,9 @@ public class ReportController extends AbstractApiController {
                     .andLessThanOrEqualTo("createTime",query.getDay()+" 23:59:59")
                     .andGreaterThanOrEqualTo("createTime",query.getDay()+" 00:00:00");
             Integer count = withdrawRecordService.countByCondition(c);
+            if (count == null || count == 0){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(BigDecimal.valueOf(count));
         } else if (query.getType() == 16){
             //平均提现金额
@@ -176,6 +212,9 @@ public class ReportController extends AbstractApiController {
             map.put("startTime",query.getDay()+" 00:00:00");
             map.put("endTime",query.getDay()+" 23:59:59");
             BigDecimal sum = withdrawRecordService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             //提现订单数
             Condition c = new Condition(RechargeRecord.class);
             c.createCriteria().andEqualTo("status",4)
@@ -192,6 +231,9 @@ public class ReportController extends AbstractApiController {
             map.put("endTime",query.getDay()+" 23:59:59");
             // 执行查询，返回一个包含求和结果的对象列表
             BigDecimal sum = redEnvelopeService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(sum);
         }else if (query.getType() == 18){
             HashMap map = new HashMap();
@@ -200,6 +242,9 @@ public class ReportController extends AbstractApiController {
             map.put("endTime",query.getDay()+" 23:59:59");
             // 执行查询，返回一个包含求和结果的对象列表
             BigDecimal sum = redEnvelopeService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(sum);
         }else if (query.getType() == 19){
             HashMap map = new HashMap();
@@ -208,38 +253,53 @@ public class ReportController extends AbstractApiController {
             map.put("endTime",query.getDay()+" 23:59:59");
             // 执行查询，返回一个包含求和结果的对象列表
             BigDecimal sum = redEnvelopeService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(sum);
         }else if (query.getType() == 20){
             HashMap map = new HashMap();
-            map.put("bizType",BizTypeEnum.PROMOTION_COMMISSION.getValue());
+            map.put("bizType",BizTypeEnum.PROMOTION_COMMISSION.getKey());
             map.put("startTime",query.getDay()+" 00:00:00");
             map.put("endTime",query.getDay()+" 23:59:59");
             // 执行查询，返回一个包含求和结果的对象列表
             BigDecimal sum = redEnvelopeService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(sum);
         }else if (query.getType() == 21){
             HashMap map = new HashMap();
-            map.put("bizType",BizTypeEnum.OPEN_GROUP_RED_ENVELOPE.getValue());
+            map.put("bizType",BizTypeEnum.OPEN_GROUP_RED_ENVELOPE.getKey());
             map.put("startTime",query.getDay()+" 00:00:00");
             map.put("endTime",query.getDay()+" 23:59:59");
             // 执行查询，返回一个包含求和结果的对象列表
             BigDecimal sum = redEnvelopeService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(sum);
         }else if (query.getType() == 22){
             HashMap map = new HashMap();
-            map.put("bizType",BizTypeEnum.JOIN_GROUP_RED_ENVELOPE.getValue());
+            map.put("bizType",BizTypeEnum.JOIN_GROUP_RED_ENVELOPE.getKey());
             map.put("startTime",query.getDay()+" 00:00:00");
             map.put("endTime",query.getDay()+" 23:59:59");
             // 执行查询，返回一个包含求和结果的对象列表
             BigDecimal sum = redEnvelopeService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(sum);
         }else if (query.getType() == 23){
             HashMap map = new HashMap();
-            map.put("bizType",BizTypeEnum.SIGN_RED_ENVELOPE.getValue());
+            map.put("bizType",BizTypeEnum.SIGN_RED_ENVELOPE.getKey());
             map.put("startTime",query.getDay()+" 00:00:00");
             map.put("endTime",query.getDay()+" 23:59:59");
             // 执行查询，返回一个包含求和结果的对象列表
             BigDecimal sum = redEnvelopeService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(sum);
         }
         return ResultGenerator.genSuccessResult(BigDecimal.ZERO);

cif-service/src/main/java/com/txz/cif/web/para/WithdrawParam.java

@@ -5,46 +5,45 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import javax.persistence.*;
+
 @Getter
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@ApiModel(value="提现入参")
+@ApiModel(value = "提现入参")
 public class WithdrawParam {
-
+    
     /**
      * 交易金额
      */
-    @ApiModelProperty(value="amount交易金额")
+    @ApiModelProperty(value = "amount交易金额")
     private BigDecimal amount;
-
-    @ApiModelProperty(value="账户类型 1钱包账户 2收益账户")
+    
+    @ApiModelProperty(value = "账户类型 1钱包账户 2收益账户")
     private Integer accountType;
-
+    
     /**
      * 渠道
      */
-    @ApiModelProperty(value="channel渠道")
+    @ApiModelProperty(value = "channel渠道")
     private String channel;
-
+    
     /**
      * 币种
      */
-    @ApiModelProperty(value="currency币种")
+    @ApiModelProperty(value = "currency币种")
     private String currency;
-
-
-    @ApiModelProperty(value="bank银行")
+    
+    
+    @ApiModelProperty(value = "bank银行")
     private String bank;
-    @ApiModelProperty(value="银行用户名称")
+    @ApiModelProperty(value = "银行用户名称")
     private String bankAccountName;
-
-
-    @ApiModelProperty(value="bankAccount银行账号")
+    
+    
+    @ApiModelProperty(value = "bankAccount银行账号")
     private String bankAccount;
-
-
+    
+    
 }