feat:check sms code

api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/ApplyStudioMerchantRequest.java

@@ -79,4 +79,7 @@ public class ApplyStudioMerchantRequest {
   @ApiModelProperty(value = "操作人ID")
   @ApiModelProperty(value = "操作人ID")
   private Long operatorId;
   private Long operatorId;
 
 
+  @ApiModelProperty(value = "不校验验证码", notes = "true-不校验；null或者false-校验验证码")
+  private Boolean notCheckSmsCode;
+
 }
 }

app/src/main/java/com/jiejing/fitness/finance/app/controller/TestController.java

@@ -2,16 +2,20 @@ package com.jiejing.fitness.finance.app.controller;
 
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.jiejing.common.model.JsonResult;
 import com.jiejing.common.model.JsonResult;
+import com.jiejing.common.request.IdRequest;
 import com.jiejing.filecenter.api.authority.AuthorityApi;
 import com.jiejing.filecenter.api.authority.AuthorityApi;
 import com.jiejing.filecenter.api.authority.request.GetAuthorityRequest;
 import com.jiejing.filecenter.api.authority.request.GetAuthorityRequest;
 import com.jiejing.filecenter.api.authority.vo.SignatureVO;
 import com.jiejing.filecenter.api.authority.vo.SignatureVO;
 import com.jiejing.filecenter.api.common.enums.AccessTypeEnum;
 import com.jiejing.filecenter.api.common.enums.AccessTypeEnum;
 import com.jiejing.filecenter.api.common.util.UploadUtil;
 import com.jiejing.filecenter.api.common.util.UploadUtil;
 import com.jiejing.filecenter.api.resource.ResourceApi;
 import com.jiejing.filecenter.api.resource.ResourceApi;
+import com.jiejing.fitness.finance.repository.entity.StudioMerchantApply;
 import com.jiejing.fitness.finance.repository.service.StudioCashierRecordRpService;
 import com.jiejing.fitness.finance.repository.service.StudioCashierRecordRpService;
+import com.jiejing.fitness.finance.repository.service.StudioMerchantApplyRpService;
 import com.jiejing.fitness.finance.service.merchant.StudioMerchantService;
 import com.jiejing.fitness.finance.service.merchant.StudioMerchantService;
 import com.jiejing.fitness.finance.service.utils.FileUtils;
 import com.jiejing.fitness.finance.service.utils.FileUtils;
 import com.jiejing.paycenter.api.merchant.MerchantQueryApi;
 import com.jiejing.paycenter.api.merchant.MerchantQueryApi;
+import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
 import com.jiejing.paycenter.common.event.MerchantEvent;
 import com.jiejing.paycenter.common.event.MerchantEvent;
 import java.io.IOException;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigDecimal;

service/src/main/java/com/jiejing/fitness/finance/service/merchant/impl/StudioMerchantServiceImpl.java

@@ -533,7 +533,10 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
 
 
   private void checkBeforeApply(ApplyStudioMerchantParams params) {
   private void checkBeforeApply(ApplyStudioMerchantParams params) {
     // 校验验证码
     // 校验验证码
-    this.validSmsCode(params.getBankCard().getPhone(), params.getSmsCode());
+    if (null == params.getNotCheckSmsCode() || !params.getNotCheckSmsCode()) {
+      this.validSmsCode(params.getBankCard().getPhone(), params.getSmsCode());
+    }
+
     // 重复提交
     // 重复提交
     Integer count = studioMerchantApplyRpService.countProcessByStudioId(params.getStudioId());
     Integer count = studioMerchantApplyRpService.countProcessByStudioId(params.getStudioId());
     if (count.compareTo(0) > 0) {
     if (count.compareTo(0) > 0) {

service/src/main/java/com/jiejing/fitness/finance/service/merchant/params/ApplyStudioMerchantParams.java

@@ -78,6 +78,9 @@ public class ApplyStudioMerchantParams {
   @NotBlank(message = "验证码不能为空")
   @NotBlank(message = "验证码不能为空")
   private String smsCode;
   private String smsCode;
 
 
+  @ApiModelProperty(value = "不校验验证码", notes = "true-不校验；null或者false-校验验证码")
+  private Boolean notCheckSmsCode;
+
   @ApiModelProperty(value = "操作人ID")
   @ApiModelProperty(value = "操作人ID")
   private Long operatorId;
   private Long operatorId;