Merge branch 'develop'

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/dronepilot/PilotCertificationDTO.java

@@ -3,6 +3,7 @@ package com.mmc.iuav.user.model.dto.dronepilot;
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.mmc.iuav.group.Create;
 import com.mmc.iuav.group.Update;
+import com.mmc.iuav.user.model.vo.UserStateVO;
 import com.mmc.iuav.user.model.vo.dronepilot.EnumValue;
 import com.mmc.iuav.user.model.vo.dronepilot.PilotAbilityVO;
 import io.swagger.annotations.ApiModelProperty;
@@ -122,4 +123,5 @@ public class PilotCertificationDTO {
     @ApiModelProperty(value = "飞手简历")
     private String pilotResume;
 
+    private UserStateVO userStateVO;
 }

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

@@ -268,4 +268,6 @@ public interface UserServiceDao {
      * @return {@link UserStateVO}
      */
     UserStateVO getUserState(Integer stateId);
+
+    Integer getUserStateId(Integer userId);
 }

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

@@ -109,7 +109,12 @@ public class UserAccountDO implements Serializable {
         this.nickName = userAccountVO.getNickName();
         this.districtChildId = userAccountVO.getDistrictChildId();
         this.briefIntroduction = userAccountVO.getBriefIntroduction();
-
+        Integer userStateId = userAccountVO.getUserStateVO().getId();
+        if(userStateId == 0) {
+            this.userStateId = null;
+        }else {
+            this.userStateId = userStateId;
+        }
     }
 
     public UserAccountDO(BUserAccountVO bUserAccountVO) {

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

@@ -11,6 +11,7 @@ import com.mmc.iuav.user.constant.WxConstant;
 import com.mmc.iuav.user.controller.userpoints.config.NumberOfUserPoints;
 import com.mmc.iuav.user.controller.userpoints.config.UserPointsEnum;
 import com.mmc.iuav.user.controller.wx.*;
+import com.mmc.iuav.user.dao.UserServiceDao;
 import com.mmc.iuav.user.dao.UserSubInfoDao;
 import com.mmc.iuav.user.dao.dronepilot.PilotCertificationDao;
 import com.mmc.iuav.user.dao.userpoints.UserPointsDao;
@@ -59,6 +60,8 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
     @Autowired
     private PilotCertificationDao certificationDao;
 
+    @Autowired
+    private UserServiceDao userServiceDao;
 
     @Autowired
     private StringRedisTemplate stringRedisTemplate;
@@ -239,6 +242,10 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
             pilotCertificationDTO.setBackUserId(flyingTeam.getBackUserId());
             pilotCertificationDTO.setMessageId(flyingTeam.getMessageId());
         }
+        Integer userStateId = userServiceDao.getUserStateId(pilotCertificationDTO.getUserAccountId());
+        if(userStateId != null) {
+            pilotCertificationDTO.setUserStateVO(userServiceDao.getUserState(userStateId));
+        }
         return ResultBody.success(pilotCertificationDTO);
     }
 

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

@@ -149,6 +149,7 @@
             <if test="password !='' and password != null">
                 password=#{password},
             </if>
+                user_state_id=#{userStateId},
             update_time = NOW()
         </set>
         <where>
@@ -778,5 +779,8 @@
     <select id="getUserState" resultType="com.mmc.iuav.user.model.vo.UserStateVO">
         select id,state,icon from user_state where id = #{stateId}
     </select>
+    <select id="getUserStateId" resultType="java.lang.Integer">
+        select user_state_id from user_account where id = #{userId}
+    </select>
 
 </mapper>

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: fca8ac46c4885c43344f13e8217159e93564b887
+  newTag: 6a1366e5d17ad9a85c000ebacbf838d6510a10ba