weifanli 3 年 前
コミット
b84783ce13

+ 32 - 0
cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/dto/RealnameAuthReq.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 实名认证请求对象
@@ -28,6 +29,13 @@ public class RealnameAuthReq implements Serializable {
     @ApiModelProperty(value = "是否修改用户信息", required = true)
     private Boolean isSave;
 
+    // 性别(1,男 0,女)
+    private int gender;
+    // 出生日期
+    private Date birthday;
+    // 头像
+    private String avatar;
+
     public String getRealName() {
         return realName;
     }
@@ -51,4 +59,28 @@ public class RealnameAuthReq implements Serializable {
     public void setSave(Boolean save) {
         isSave = save;
     }
+
+    public int getGender() {
+        return gender;
+    }
+
+    public void setGender(int gender) {
+        this.gender = gender;
+    }
+
+    public Date getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Date birthday) {
+        this.birthday = birthday;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
 }

+ 1 - 1
cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserDao.java

@@ -117,7 +117,7 @@ public interface SysUserDao extends BaseDAO<Long, SysUser> {
      * @updateTime 2022/3/18 15:57
      * @return: java.lang.Integer
      */
-    Integer updateUserCard(@Param("param") RealnameAuthReq param, @Param("idcardInfo") IdcardInfoExtractor idcardInfo, @Param("avatar") String avatar);
+    Integer updateUserCard(@Param("param") RealnameAuthReq param);
 
     /***
      * 查询老师设置详情

+ 1 - 1
cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserService.java

@@ -152,7 +152,7 @@ public interface SysUserService extends BaseService<Long, SysUser> {
      * @updateTime 2022/3/22 15:11
      * @return: java.lang.Integer
      */
-    void updateUserCard(RealnameAuthReq realNameAuthDto, IdcardInfoExtractor idcardInfoExtractor, String avatar);
+    void updateUserCard(RealnameAuthReq realNameAuthDto);
 
     /***
      * 用户设置页面详情

+ 2 - 2
cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -185,8 +185,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
     }
 
     @Override
-    public void updateUserCard(RealnameAuthReq realNameAuthDto, IdcardInfoExtractor idcardInfoExtractor, String avatar) {
-        sysUserDao.updateUserCard(realNameAuthDto, idcardInfoExtractor, avatar);
+    public void updateUserCard(RealnameAuthReq realNameAuthDto) {
+        sysUserDao.updateUserCard(realNameAuthDto);
     }
 
     @Override

+ 4 - 1
cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -449,8 +449,11 @@ public class UserController extends BaseController {
                 user.setAvatar(
                         0 == idcardInfoExtractor.getGender() ? sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD_GIRL) : sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD_BOY));
             }
+            realNameAuthDto.setGender(idcardInfoExtractor.getGender());
+            realNameAuthDto.setBirthday(idcardInfoExtractor.getBirthday());
+            realNameAuthDto.setAvatar(user.getAvatar());
             //实名认证通过后立刻保存
-            sysUserService.updateUserCard(realNameAuthDto, idcardInfoExtractor, user.getAvatar());
+            sysUserService.updateUserCard(realNameAuthDto);
         }
         return succeed(idcardInfoExtractor);
     }

+ 6 - 6
cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -211,14 +211,14 @@
             <if test="param.idCardNo != null and param.idCardNo != ''">
                 id_card_no_ = #{param.idCardNo},
             </if>
-            <if test="idcardInfo.gender != null">
-                gender_ = #{idcardInfo.gender},
+            <if test="param.gender != null">
+                gender_ = #{param.gender},
             </if>
-            <if test="idcardInfo.birthdate != null and idcardInfo.birthdate != ''">
-                birthdate_ = #{idcardInfo.birthdate},
+            <if test="param.birthdate != null and param.birthdate != ''">
+                birthdate_ = #{param.birthdate},
             </if>
-            <if test="avatar != null and avatar != ''">
-                avatar_ = #{avatar},
+            <if test="param.avatar != null and param.avatar != ''">
+                avatar_ = #{param.avatar},
             </if>
         </set>
         WHERE id_ = #{param.userId}