UserAccount(add)

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/UserAccountVO.java

@@ -69,4 +69,6 @@ public class UserAccountVO implements Serializable {
     private Integer leader;
     @ApiModelProperty(value = "实名认证状态")
     private Integer realNameAuthStatus;
+    @ApiModelProperty(value = "飞手审核 0审核中 1审核通过 2审核不通过 null不是飞手")
+    private Integer auditStatus;
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/UserAccountController.java

@@ -38,7 +38,7 @@ public class UserAccountController extends BaseController {
     @ApiOperation(value = "获取用户信息")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = UserAccountVO.class)})
     @GetMapping("info")
-    public ResultBody info(HttpServletRequest request) {
+    public ResultBody<UserAccountVO> info(HttpServletRequest request) {
         return ResultBody.success(userAccountService.getUserAccountById(this.getUserLoginInfoFromRedis(request).getUserAccountId()));
     }
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/UserAccountDO.java

@@ -68,6 +68,13 @@ public class UserAccountDO implements Serializable {
      */
     private String operatorUserName;
 
+    /**
+     * 飞手审核状态
+     *
+     * @param auditStatus
+     */
+    private Integer auditStatus;
+
     public UserAccountDO(UserAccountVO userAccountVO) {
         this.id = userAccountVO.getId();
         this.phoneNum = userAccountVO.getPhoneNum();
@@ -102,6 +109,7 @@ public class UserAccountDO implements Serializable {
                 .userRcdVO(this.userRcdDO == null ? null : this.userRcdDO.buildUserRcdVO())
                 .leader(this.leader)
                 .realNameAuthStatus(this.realNameAuthStatus)
+                .auditStatus(this.auditStatus)
                 .build();
     }
 

csm-service/cms-service-user/src/main/resources/mapper/UserServiceDao.xml

@@ -95,8 +95,8 @@
 
     <update id="disableUserAccount">
         update user_account
-        set disable = 1,
-            union_id   = #{removeNO}
+        set disable  = 1,
+            union_id = #{removeNO}
         where id = #{userAccountId}
     </update>
 
@@ -123,24 +123,26 @@
     </select>
 
     <select id="getUserAccountById" resultType="com.mmc.iuav.user.entity.UserAccountDO">
-        select id,
-               phone_num,
-               user_name,
-               nick_name,
-               user_img,
-               open_id,
-               union_id,
-               user_sex,
-               email,
-               source,
-               account_status,
-               remark,
-               port_type,
-               disable,
-               create_time,
-               update_time
-        from user_account
-        where id = #{id}
+        SELECT ua.id,
+               ua.phone_num,
+               ua.user_name,
+               ua.nick_name,
+               ua.user_img,
+               ua.open_id,
+               ua.union_id,
+               ua.user_sex,
+               ua.email,
+               ua.`source`,
+               ua.account_status,
+               ua.remark,
+               ua.port_type,
+               ua.`DISABLE`,
+               ua.create_time,
+               ua.update_time,
+               pc.audit_status
+        FROM user_account ua
+                 LEFT JOIN pilot_certification pc ON pc.user_account_id = ua.id
+        WHERE ua.id = #{id}
     </select>
 
     <select id="listUserAccountIdsByDistrictCode" resultType="java.lang.Integer">
@@ -355,23 +357,26 @@
     </select>
 
     <select id="countRcd" resultType="int">
-        select count(*) from user_rcd where rcd_user_id = #{userAccountId}
+        select count(*)
+        from user_rcd
+        where rcd_user_id = #{userAccountId}
     </select>
 
     <select id="listUserRcd" resultType="com.mmc.iuav.user.entity.UserAccountDO"
             parameterType="com.mmc.iuav.user.model.qo.UserRcdQO">
-        select ua.id,ua.phone_num, ua.user_name, ua.nick_name, ua.user_img,ur.create_time
-        from user_account ua inner join user_rcd ur on ua.id = ur.user_account_id
+        select ua.id, ua.phone_num, ua.user_name, ua.nick_name, ua.user_img, ur.create_time
+        from user_account ua
+                 inner join user_rcd ur on ua.id = ur.user_account_id
         where ur.rcd_user_id = #{userAccountId}
         order by ur.create_time desc
-        limit #{pageNo}, #{pageSize}
+            limit #{pageNo}, #{pageSize}
     </select>
 
     <select id="topRcd" resultType="com.mmc.iuav.user.entity.UserAccountDO">
         select ua.id,
                ua.nick_name,
-			   ua.user_img,
-			   ua.user_name,
+               ua.user_img,
+               ua.user_name,
                ua.phone_num,
                count(*) as invite_count
         from user_rcd urd
@@ -417,7 +422,8 @@
                create_time,
                update_time
         from user_account
-        where phone_num = #{phoneNum} and disable = 0
+        where phone_num = #{phoneNum}
+          and disable = 0
     </select>
 
 </mapper>