Merge branch 'develop'

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

+package com.mmc.iuav.user.model.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserBaseInfoDTO {
+    private Integer userAccountId;
+
+    private String userName;
+
+    private String phoneNum;
+
+    private String nickName;
+}

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

@@ -37,6 +37,9 @@ public class PilotTeamQO implements Serializable {
     @ApiModelProperty(value = "飞手团队后台id")
     private Integer backId;
 
+    @ApiModelProperty(value = "申请飞手的手机号")
+    private String phoneNum;
+
     public void buildCurrentPage() {
         this.pageNo = (pageNo - 1) * pageSize;
     }

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

@@ -4,6 +4,7 @@ import com.mmc.iuav.group.Page;
 import com.mmc.iuav.group.Update;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.model.dto.UserAccountSimpleDTO;
+import com.mmc.iuav.user.model.dto.UserBaseInfoDTO;
 import com.mmc.iuav.user.model.qo.UserAccountQO;
 import com.mmc.iuav.user.model.qo.UserMessageQO;
 import com.mmc.iuav.user.model.qo.UserRcdQO;
@@ -66,6 +67,13 @@ public class UserAccountController extends BaseController {
         return userAccountService.feignListUserAccountIds(provinceCode, cityCode, districtCode);
     }
 
+    @ApiOperation(value = "根据用户id获取用户的基本信息", hidden = true)
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = UserBaseInfoDTO.class)})
+    @GetMapping("feignGetUserBaseInfo")
+    public UserBaseInfoDTO feignGetUserBaseInfo(@RequestParam Integer userAccountId) {
+        return userAccountService.feignGetUserBaseInfo(userAccountId);
+    }
+
     @ApiOperation(value = "授权手机号-裂变邀请")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = Integer.class)})
     @GetMapping("getUserPhoneNumber")

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

@@ -4,6 +4,7 @@ import com.mmc.iuav.user.entity.UserAccountDO;
 import com.mmc.iuav.user.entity.UserRcdDO;
 import com.mmc.iuav.user.entity.data.ActiveUserCountDO;
 import com.mmc.iuav.user.entity.fdd.UserFddDO;
+import com.mmc.iuav.user.model.dto.UserBaseInfoDTO;
 import com.mmc.iuav.user.model.qo.UserAccountQO;
 import com.mmc.iuav.user.model.qo.UserMessageQO;
 import com.mmc.iuav.user.model.qo.UserRcdQO;
@@ -218,4 +219,12 @@ public interface UserServiceDao {
      * @return {@link Integer} 1表示被邀请过了 0表示没有
      */
     Integer getCountUserByUserCrd(Integer userId);
+
+
+    /**
+     * 根据用户的id获取用户的基本信息
+     * @param userAccountId 用户id
+     * @return {@link UserBaseInfoDTO}
+     */
+    UserBaseInfoDTO getUserBaseInfo(Integer userAccountId);
 }

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

@@ -4,6 +4,7 @@ import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.entity.UserAccountDO;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.dto.UserAccountSimpleDTO;
+import com.mmc.iuav.user.model.dto.UserBaseInfoDTO;
 import com.mmc.iuav.user.model.qo.UserAccountQO;
 import com.mmc.iuav.user.model.qo.UserMessageQO;
 import com.mmc.iuav.user.model.qo.UserRcdQO;
@@ -179,4 +180,6 @@ public interface UserAccountService {
     ResultBody appUpdateUser(UserMessageQO userMessageQO);
 
     UserAccountMessageVo userMessages(Integer userAccountId);
+
+    UserBaseInfoDTO feignGetUserBaseInfo(Integer userAccountId);
 }

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

@@ -17,6 +17,7 @@ import com.mmc.iuav.user.entity.userpoints.UserPointsDetails;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.dto.RealNameAuthDTO;
 import com.mmc.iuav.user.model.dto.UserAccountSimpleDTO;
+import com.mmc.iuav.user.model.dto.UserBaseInfoDTO;
 import com.mmc.iuav.user.model.qo.UserAccountQO;
 import com.mmc.iuav.user.model.qo.UserMessageQO;
 import com.mmc.iuav.user.model.qo.UserRcdQO;
@@ -556,5 +557,10 @@ public class UserAccountServiceImpl implements UserAccountService {
         return user;
     }
 
+    @Override
+    public UserBaseInfoDTO feignGetUserBaseInfo(Integer userAccountId) {
+        return userServiceDao.getUserBaseInfo(userAccountId);
+    }
+
 
 }

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

@@ -659,5 +659,9 @@
     <select id="getCountUserByUserCrd" resultType="java.lang.Integer">
         select count(id) from user_rcd where user_account_id = #{userId}
     </select>
+    <select id="getUserBaseInfo" resultType="com.mmc.iuav.user.model.dto.UserBaseInfoDTO">
+        select rna.user_account_id,ua.nick_name,rna.user_name,ua.phone_num from user_account ua left join real_name_auth rna on ua.id = rna.user_account_id
+        where ua.id = #{userAccountId}
+    </select>
 
 </mapper>

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

@@ -434,6 +434,9 @@
         <if test="pilotStatus!=null">
             and pjt.pilot_status = #{pilotStatus}
         </if>
+        <if test="phoneNum!=null and phoneNum != '' ">
+            and pjt.phone_num = #{phoneNum}
+        </if>
         order by pc.update_time desc, pc.create_time desc
 
     </select>

csm-service/cms-service-user/src/main/resources/not-check.yml

@@ -41,4 +41,5 @@ data-filter:
     - /userapp/user/report/getJoinStoreNumber
     - /userapp/user-account/userMessages
     - /userapp/company/getCompanyInfoByBUId
+    - /userapp/user-account/feignGetUserBaseInfo
 

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: 7396d39b5e9f673d7581ad0045dd4e5709b9e270
+  newTag: 46a43df60d229f51adcc7ca999b70db01751f9fa