客户列表添加小猪认证字段

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/qo/UserAccountQO.java

@@ -50,6 +50,9 @@ public class UserAccountQO implements Serializable {
     @ApiModelProperty(value = "企业认证状态（0未通过，1通过）", example = "1")
     private Integer companyAuthStatus;
 
+    @ApiModelProperty(value = "小猪结算认证（0未通过，1通过）", example = "1")
+    private Integer xzAuthStatus;
+
     @ApiModelProperty(value = "电子签章认证状态（0未通过，1通过）", hidden = true)
     private Integer entVerifyStatus;
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/UserAccountServiceImpl.java

@@ -364,6 +364,7 @@ public class UserAccountServiceImpl implements UserAccountService {
         // 设置推荐（邀请）伙伴个数
         buildInviteCount(uIds, userAccountDOList);
         List<UserAccountVO> userAccountVOS = userAccountDOList.stream().map(UserAccountDO::buildUserAccountVO).collect(Collectors.toList());
+
         return ResultBody.success(PageResult.buildPage(pageNo, param.getPageSize(), count, userAccountVOS));
     }
 

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

@@ -24,6 +24,7 @@
         <result property="companyAuthStatus" column="companyAuthStatus"/>
         <result property="companyName" column="company_name"/>
         <result property="realNameAuthStatus" column="realNameAuthStatus"/>
+        <result property="xzAuthStatus" column="xz_auth_status"/>
         <association property="userRcdDO" javaType="com.mmc.iuav.user.entity.UserRcdDO">
             <id property="id" column="user_rcd_id"/>
             <result property="rcdUserId" column="rcd_user_id"/>
@@ -283,6 +284,7 @@
         LEFT JOIN company_member cm ON cm.user_account_id = ua.id
         LEFT JOIN company_info ci ON ci.id = cm.company_info_id
         LEFT JOIN real_name_auth rna ON rna.user_account_id = ua.id
+        LEFT JOIN xz_auth xza ON ua.id = xza.user_account_id
         WHERE
         ua.disable = 0 and ua.port_type = 100
         <if test="companyInfoId != null">
@@ -303,6 +305,12 @@
         <if test="realAuthStatus == 0">
             AND ( rna.check_status is null or rna.check_status = 0 )
         </if>
+        <if test="xzAuthStatus == 1">
+            AND xza.xz_auth_status = #{xzAuthStatus}
+        </if>
+        <if test="realAuthStatus == 0">
+            AND ( xza.xz_auth_status is null or xza.xz_auth_status = 0 )
+        </if>
         <if test="startTime != null ">
             AND ua.create_time >= #{startTime}
         </if>
@@ -345,7 +353,8 @@
         r_user.nick_name AS rcdNickname,
         r_user.user_name AS rcdUserName,
         rna.user_name,
-        rna.check_status as realNameAuthStatus
+        rna.check_status as realNameAuthStatus,
+        xza.xz_auth_status
         FROM
         user_account ua
         LEFT JOIN company_member cm ON cm.user_account_id = ua.id
@@ -353,6 +362,7 @@
         LEFT JOIN user_rcd rcd ON rcd.user_account_id = ua.id
         LEFT JOIN user_account r_user ON r_user.id = rcd.rcd_user_id
         LEFT JOIN real_name_auth rna ON rna.user_account_id = ua.id
+        LEFT JOIN xz_auth xza ON ua.id = xza.user_account_id
         WHERE
         ua.`disable` = 0
         AND ua.port_type = 100
@@ -374,6 +384,12 @@
         <if test="realAuthStatus == 0">
             AND ( rna.check_status is null or rna.check_status = 0 )
         </if>
+        <if test="xzAuthStatus == 1">
+            AND xza.xz_auth_status = #{xzAuthStatus}
+        </if>
+        <if test="realAuthStatus == 0">
+            AND ( xza.xz_auth_status is null or xza.xz_auth_status = 0 )
+        </if>
         <if test="startTime != null ">
             AND ua.create_time >= #{startTime}
         </if>