优化门店认证流程

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/ChannelController.java

@@ -694,8 +694,30 @@ public class ChannelController extends BaseApiController {
         }
         Channel channel = mapperFacade.map(verifyParam, Channel.class);
         try {
-            channel.setVerifyStatus(ChannelVerifyStatusEnum.WAIT);
+//            channel.setVerifyStatus(ChannelVerifyStatusEnum.WAIT);
+            // 简化认证流程，提交信息时同时做原来认证操作
+            channel.setVerifyStatus(ChannelVerifyStatusEnum.ACCEPT);
+            channel.setCertifyStatus(ChannelCertifyStatusEnum.CERTIFIED);
             channelService.updateById(channel);
+
+            UserAddr userAddr = new UserAddr();
+            userAddr.setUserId(SecurityUtils.getUserId());
+            userAddr.setReceiver(verifyParam.getContact());
+            userAddr.setProvince(verifyParam.getProvince());
+            userAddr.setProvinceId(verifyParam.getProvinceId());
+            userAddr.setCity(verifyParam.getCity());
+            userAddr.setCityId(verifyParam.getCityId());
+            userAddr.setArea(verifyParam.getArea());
+            userAddr.setAreaId(verifyParam.getAreaId());
+            userAddr.setAddr(verifyParam.getAddress());
+            userAddr.setMobile(verifyParam.getMobile());
+            userAddr.setStatus(1);
+            int count = userAddrService.count(
+                    new LambdaQueryWrapper<UserAddr>().eq(UserAddr::getUserId, channel.getUserId()));
+            if (count == 0) {
+                userAddr.setCommonAddr(1);
+            }
+            userAddrService.save(userAddr);
         } catch (Exception e) {
             return AjaxResult.error("门店'" + channel.getName() + "'提交认证信息失败");
         }

mp-common/src/main/java/com/qs/mp/common/enums/ChannelCertifyStatusEnum.java

@@ -13,8 +13,10 @@ import com.qs.mp.common.json.EnumValueDeserializer;
 @JSONType(deserializer = EnumValueDeserializer.class)
 public enum ChannelCertifyStatusEnum implements IEnum<String> {
 
-  NOT_CERTIFIED("n", "未认证"),
-  CERTIFIED("y", "已认证");
+//  NOT_CERTIFIED("n", "未认证"),
+  NOT_CERTIFIED("n", "未补充"),
+//  CERTIFIED("y", "已认证");
+  CERTIFIED("y", "已补充");
 
   private final String value;
   private final String desc;

mp-service/src/main/java/com/qs/mp/channel/domain/param/VerifyParam.java

@@ -23,8 +23,12 @@ public class VerifyParam {
 	@ApiModelProperty(value = "联系人",required=true)
 	private String contact;
 
-	@NotNull(message = "门店类型不能为空")
-	@ApiModelProperty(value = "门店类型",required=true)
+	@NotNull(message = "手机号码不能为空")
+	@ApiModelProperty(value = "手机号码", required = true)
+	private String mobile;
+
+//	@NotNull(message = "门店类型不能为空")
+	@ApiModelProperty(value = "门店类型", required = false)
 	private SiteTypeEnum siteType;
 
 	@NotNull(message = "门店名称不能为空")
@@ -59,12 +63,12 @@ public class VerifyParam {
 	@ApiModelProperty(value = "详细地址",required=true)
 	private String address;
 
-	@NotNull(message = "营业执照不能为空")
-	@ApiModelProperty(value = "营业执照",required=true)
-	private String bizLicensePic;
+//	@NotNull(message = "营业执照不能为空")
+@ApiModelProperty(value = "营业执照",required=false)
+private String bizLicensePic;
 
-	@NotNull(message = "门店照片不能为空")
-	@ApiModelProperty(value = "门店照片",required=true)
-	private String doorPic;
+//	@NotNull(message = "门店照片不能为空")
+@ApiModelProperty(value = "门店照片",required=false)
+private String doorPic;
 
 }