个人认证

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/constant/MerchantApplyStatus.java

@@ -6,15 +6,15 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum MerchantApplyStatus {
-    PROCESSING(0, "PROCESSING","审核中"),
-    SUCCESS(1, "SUCCESS","入网完成"),
-    PASS(2, "PASS","审核通过"),
-    NO_PASS(3, "NO_PASS","审核不通过"),
-    REFUSE(4, "REFUSE","审核拒绝"),
-    ESIGN_PROCESS(5, "ESIGN_PROCESS","待签约"),
-    ESIGN_PROCESSING(6, "ESIGN_PROCESSING","签约中"),
-    ESIGN_FAIL(7, "ESIGN_FAIL","签约失败"),
-    ESIGN_SUCCESS(8, "ESIGN_SUCCESS","签约成功"),
+    PROCESSING(1, "PROCESSING","审核中"),
+    SUCCESS(2, "SUCCESS","入网完成"),
+    PASS(3, "PASS","审核通过"),
+    NO_PASS(4, "NO_PASS","审核不通过"),
+    REFUSE(5, "REFUSE","审核拒绝"),
+    ESIGN_PROCESS(6, "ESIGN_PROCESS","待签约"),
+    ESIGN_PROCESSING(7, "ESIGN_PROCESSING","签约中"),
+    ESIGN_FAIL(8, "ESIGN_FAIL","签约失败"),
+    ESIGN_SUCCESS(9, "ESIGN_SUCCESS","签约成功"),
     ;
 
     private Integer status;

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/UserAuthDTO.java

@@ -25,7 +25,7 @@ public class UserAuthDTO {
     private Long userId;
 
     /**
-     * 认证状态：0-审核中；1-入网完成；2-审核通过；3-审核不通过；4-审核拒绝；5-待签约；6-签约中；7-签约失败；8-签约成功；
+     * 认证状态：认证状态：0-未申请；1-审核中；2-入网完成；3-审核通过；4-审核不通过；5-审核拒绝；6-待签约；7-签约中；8-签约失败；9-签约成功；
      */
     private Integer status;
 

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/UserAuthParam.java

@@ -35,21 +35,11 @@ public class UserAuthParam {
      */
     private String bankCardNo;
 
-    /**
-     * 邮箱
-     */
-    private String email;
-
     /**
      * 电话
      */
     private String phone;
 
-    /**
-     * 地址
-     */
-    private String address;
-
     /**
      * 身份证有效期开始时间
      */
@@ -59,24 +49,4 @@ public class UserAuthParam {
      * 身份证有效期
      */
     private Date idCardExpirationDate;
-
-    /**
-     * 开户名称
-     */
-    private String accountName;
-
-    /**
-     * 省
-     */
-    private Integer province;
-
-    /**
-     * 市
-     */
-    private Integer city;
-
-    /**
-     * 区
-     */
-    private Integer district;
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/entity/UserAuth.java

@@ -36,7 +36,7 @@ public class UserAuth {
     private String userName;
 
     /**
-     * 认证状态：0-审核中；1-入网完成；2-审核通过；3-审核不通过；4-审核拒绝；5-待签约；6-签约中；7-签约失败；8-签约成功；
+     * 认证状态：0-未申请；1-审核中；2-入网完成；3-审核通过；4-审核不通过；5-审核拒绝；6-待签约；7-签约中；8-签约失败；9-签约成功；
      */
     private Integer status;
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/UserAuthServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.chelvc.cloud.user.client.UserClient;
 import com.chelvc.cloud.vehicle.client.dto.UserAuthDTO;
 import com.chelvc.cloud.vehicle.client.param.UserAuthParam;
 import com.chelvc.cloud.vehicle.server.dao.UserAuthMapper;
@@ -24,7 +23,6 @@ import java.time.LocalDateTime;
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class UserAuthServiceImpl extends ServiceImpl<UserAuthMapper, UserAuth> implements UserAuthService {
     private final MerchantRelationService merchantRelationService;
-    private final UserClient userClient;
     @Override
     public UserAuthDTO getUserAuthInfo(Long userId) {
         if(userId == null){
@@ -59,15 +57,15 @@ public class UserAuthServiceImpl extends ServiceImpl<UserAuthMapper, UserAuth> i
             userAuth.setIdCardBackPhoto(param.getIdCardBackPhoto());
             userAuth.setIdCardFrontPhoto(param.getIdCardFrontPhoto());
             userAuth.setUserName(param.getUserName());
-            userAuth.setCity(param.getCity());
-            userAuth.setProvince(param.getProvince());
-            userAuth.setDistrict(param.getDistrict());
+            userAuth.setProvince(510000);   //四川省
+            userAuth.setCity(510100);       //成都市
+            userAuth.setDistrict(510116);   //双流区
             userAuth.setPhone(param.getPhone());
-            userAuth.setEmail(param.getEmail());
-            userAuth.setAddress(param.getAddress());
+            userAuth.setEmail("chelvc@qq.com");
+            userAuth.setAddress("四川省成都市双流区");
             userAuth.setIdCardExpirationDateStart(param.getIdCardExpirationDateStart());
             userAuth.setIdCardExpirationDate(param.getIdCardExpirationDate());
-            userAuth.setAccountName(param.getAccountName());
+            userAuth.setAccountName(param.getUserName());
             userAuth.setIdCardNo(param.getIdCardNo());
             userAuth.setStatus(1);
             baseMapper.updateById(userAuth);