Merge branch 'develop'

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

@@ -25,4 +25,7 @@ public class NewMessageVO {
 
     @ApiModelProperty(value = "未审核帖子信息")
     private int dynamicMessage;
+
+    @ApiModelProperty(value = "未读合伙人信息")
+    private int userStateMessage;
 }

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

@@ -97,4 +97,8 @@ public class UserAccountVO implements Serializable {
     private Integer backUserId;
     @ApiModelProperty(value = "密码")
     private String password;
+
+
+    @ApiModelProperty(value = "用户状态")
+    private UserStateVO userStateVO;
 }

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

+package com.mmc.iuav.user.model.vo;
+
+import java.io.Serializable;
+
+/**
+ * (UserState)实体类
+ *
+ * @author makejava
+ * @since 2024-03-20 10:09:59
+ */
+public class UserStateVO implements Serializable {
+    private static final long serialVersionUID = -32633125960150583L;
+
+    private Integer id;
+    /**
+     * 用户状态
+     */
+    private String state;
+    /**
+     * 状态图标
+     */
+    private String icon;
+
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+}
\ No newline at end of file

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

@@ -195,4 +195,11 @@ public class UserAccountController extends BaseController {
         return ResultBody.success(userAccountService.userMessages(userAccountId));
     }
 
+    @ApiOperation(value = "用户状态列表")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("getStateList")
+    public ResultBody getStateList() {
+        return userAccountService.getStateList();
+    }
+
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/UserServiceDao.java

@@ -2,6 +2,7 @@ package com.mmc.iuav.user.dao;
 
 import com.mmc.iuav.user.entity.UserAccountDO;
 import com.mmc.iuav.user.entity.UserRcdDO;
+import com.mmc.iuav.user.entity.UserStateDO;
 import com.mmc.iuav.user.entity.data.ActiveUserCountDO;
 import com.mmc.iuav.user.entity.fdd.UserFddDO;
 import com.mmc.iuav.user.model.dto.UserBaseInfoDTO;
@@ -9,6 +10,7 @@ import com.mmc.iuav.user.model.qo.UserAccountQO;
 import com.mmc.iuav.user.model.qo.UserMessageQO;
 import com.mmc.iuav.user.model.qo.UserRcdQO;
 import com.mmc.iuav.user.model.vo.UserAccountMessageVo;
+import com.mmc.iuav.user.model.vo.UserStateVO;
 import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -257,4 +259,13 @@ public interface UserServiceDao {
 
 
     UserAccountDO getUserAccountInfoByPhoneNum(String phoneNum);
+
+    List<UserStateDO> getStateList();
+
+    /**
+     * 获取用户当前状态
+     * @param stateId 状态id
+     * @return {@link UserStateVO}
+     */
+    UserStateVO getUserState(Integer stateId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/dronepilot/PilotCertificationDao.java

@@ -184,4 +184,10 @@ public interface PilotCertificationDao {
      * @return int
      */
     int pilotAuditStatus(Integer userId);
+
+    /**
+     * 查询未审核的合伙人个数
+     * @return int
+     */
+    int getStateMessage();
 }

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

@@ -91,6 +91,8 @@ public class UserAccountDO implements Serializable {
     private Integer districtChildId;
     //web端登录密码
     private String password;
+    @ApiModelProperty(value = "用户状态")
+    private Integer userStateId;
     public UserAccountDO(UserAccountVO userAccountVO) {
         this.id = userAccountVO.getId();
         this.phoneNum = userAccountVO.getPhoneNum();

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

+package com.mmc.iuav.user.entity;
+
+import java.io.Serializable;
+
+/**
+ * (UserState)实体类
+ *
+ * @author makejava
+ * @since 2024-03-20 10:09:59
+ */
+public class UserStateDO implements Serializable {
+    private static final long serialVersionUID = -32633125960150583L;
+
+    private Integer id;
+    /**
+     * 用户状态
+     */
+    private String state;
+    /**
+     * 状态图标
+     */
+    private String icon;
+
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+}
+

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

@@ -3,6 +3,7 @@ package com.mmc.iuav.user.service;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.entity.BackUserAccountDO;
 import com.mmc.iuav.user.entity.UserAccountDO;
+import com.mmc.iuav.user.entity.UserStateDO;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.dto.UserAccountSimpleDTO;
 import com.mmc.iuav.user.model.dto.UserBaseInfoDTO;
@@ -190,4 +191,6 @@ public interface UserAccountService {
      */
     String selectUnionIdByPhone(String phone);
 
+    ResultBody getStateList();
+
 }

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

@@ -301,6 +301,8 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
 
         newMessageVO.setOrderMessage(omsClient.getCountNewOrder());
         newMessageVO.setDynamicMessage(imsClient.getDynamicMessageSum());
+
+        newMessageVO.setUserStateMessage(certificationDao.getStateMessage());
         return ResultBody.success(newMessageVO);
     }
 }

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

@@ -165,6 +165,10 @@ public class UserAccountServiceImpl implements UserAccountService {
         if(backUserId!=null) {
             userAccountVO.setBackUserId(backUserId);
         }
+        Integer userStateId = userAccountDO.getUserStateId();
+        if(userStateId != null){
+            userAccountVO.setUserStateVO(userServiceDao.getUserState(userStateId));
+        }
         return userAccountVO;
     }
 
@@ -597,7 +601,11 @@ public class UserAccountServiceImpl implements UserAccountService {
         return userServiceDao.selectUnionIdByPhone(phone);
     }
 
-
+    @Override
+    public ResultBody getStateList() {
+        List<UserStateDO> stateList = userServiceDao.getStateList();
+        return ResultBody.success(stateList);
+    }
 
 
 }

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

@@ -208,7 +208,8 @@
                up.total_points,
                ua.brief_introduction,
                ua.cover_picture,
-               ua.district_child_id
+               ua.district_child_id,
+               ua.user_state_id
         FROM user_account ua
                  LEFT JOIN pilot_certification pc ON pc.user_account_id = ua.id
                  LEFT JOIN user_points up ON up.user_account_id = ua.id
@@ -771,5 +772,11 @@
         where phone_num = #{phoneNum}
           and disable = 0
     </select>
+    <select id="getStateList" resultType="com.mmc.iuav.user.entity.UserStateDO">
+        select id,state,icon from user_state
+    </select>
+    <select id="getUserState" resultType="com.mmc.iuav.user.model.vo.UserStateVO">
+        select id,state,icon from user_state where id = #{stateId}
+    </select>
 
 </mapper>

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

@@ -618,6 +618,11 @@
         where user_account_id = #{userId}
         and audit_status = 1
     </select>
+    <select id="getStateMessage" resultType="java.lang.Integer">
+        select count(1)
+        from user_partner
+        where status = 0
+    </select>
 
     <update id="chongqian">
         update pay_wallet

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 13c6141293cf398db441e015c3446f269ced8300
+  newTag: fca8ac46c4885c43344f13e8217159e93564b887