Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/cms into develop

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

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

@@ -30,6 +30,9 @@ public class UserApplyTagDetailsVO {
   @ApiModelProperty(value = "附件")
   private List<AttachmentVO> attachmentList;
 
+  @ApiModelProperty(value = "合同订单编号")
+  private String orderNo;
+
   @ApiModelProperty(value = "备注")
   private String remark;
 }

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

@@ -72,11 +72,4 @@ public class ActivityController extends BaseController {
         return activityService.inviteDetail(activityQO);
     }
 
-    @ApiOperation(value = "测试参与活动")
-    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
-    @GetMapping("test")
-    public ResultBody test(@RequestParam Integer activityType, @RequestParam("userAccountId") Integer userAccountId, @RequestParam("pUserAccountId") Integer pUserAccountId) {
-        return activityService.participateActivity(activityType, userAccountId, pUserAccountId);
-    }
-
 }

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

@@ -201,5 +201,7 @@ public interface UserServiceDao {
 
     List<String> userMessagesPilot(Integer pilotId);
 
+    List<UserAccountDO> listAllUserAccountByIds(@Param("userIds") List<Integer> ids);
+
     int appUserCompanyAuthCount();
 }

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

@@ -93,6 +93,14 @@ public interface UserAccountService {
     List<UserAccountSimpleDTO> feignListUserAccountByIds(List<Integer> ids);
 
     /**
+     * 根据id获取用户信息,包括已删除的
+     *
+     * @param ids
+     * @return
+     */
+    List<UserAccountSimpleDTO> feignListAllUserAccountByIds(List<Integer> ids);
+
+    /**
      * 根据用户id获取推荐人信息
      *
      * @param userIds

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

 package com.mmc.iuav.user.service.impl;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.mmc.iuav.page.PageResult;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.dao.ActivityDao;
@@ -129,6 +130,7 @@ public class ActivityServiceImpl implements ActivityService {
 
     @Override
     public ResultBody inviteDetail(ActivityQO activityQO) {
+        log.info("InviteDetail parameter:{}", JSONObject.toJSONString(activityQO));
         int count = activityDao.countActivityPartDetail(activityQO);
         if (count == 0) {
             return ResultBody.success(PageResult.buildPage(activityQO.getPageNo(), activityQO.getPageSize(), count));
@@ -141,8 +143,8 @@ public class ActivityServiceImpl implements ActivityService {
         List<Integer> userIds = activityPartDTOS.stream().map(ActivityPartDTO::getUserAccountId).collect(Collectors.toList());
         // 被邀请人id
         List<Integer> pUserIds = activityPartDTOS.stream().map(ActivityPartDTO::getPUserAccountId).collect(Collectors.toList());
-        List<UserAccountSimpleDTO> userAccountSimpleDTOS = userAccountService.feignListUserAccountByIds(userIds);
-        List<UserAccountSimpleDTO> pUserAccountDTOS = userAccountService.feignListUserAccountByIds(pUserIds);
+        List<UserAccountSimpleDTO> userAccountSimpleDTOS = userAccountService.feignListAllUserAccountByIds(userIds);
+        List<UserAccountSimpleDTO> pUserAccountDTOS = userAccountService.feignListAllUserAccountByIds(pUserIds);
         if (!CollectionUtils.isEmpty(userAccountSimpleDTOS)) {
             Map<Integer, UserAccountSimpleDTO> userMap = userAccountSimpleDTOS.stream().collect(Collectors.toMap(UserAccountSimpleDTO::getId, k1 -> k1, (k1, k2) -> k2));
             for (ActivityPartDTO activityPartDTO : activityPartDTOS) {

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

@@ -187,6 +187,7 @@ public class CooperationServiceImpl implements CooperationService {
         userApplyTagDetailsVO.setLicenseImg(companyInfoDO.getLicenseImg());
         userApplyTagDetailsVO.setCreditCode(companyInfoDO.getCreditCode());
         userApplyTagDetailsVO.setRemark(userApplyTag.getRemark());
+        userApplyTagDetailsVO.setOrderNo(userApplyTag.getOrderNo());
         return ResultBody.success(userApplyTagDetailsVO);
     }
 

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

@@ -313,6 +313,18 @@ public class UserAccountServiceImpl implements UserAccountService {
     }
 
     @Override
+    public List<UserAccountSimpleDTO> feignListAllUserAccountByIds(List<Integer> ids) {
+        List<UserAccountDO> userAccountDOS = userServiceDao.listAllUserAccountByIds(ids);
+        if (!CollectionUtils.isEmpty(userAccountDOS)) {
+            List<UserAccountSimpleDTO> userAccountSimpleDTOS = userAccountDOS.stream().map(UserAccountDO::buildUserAccountSimpleDTO).collect(Collectors.toList());
+            //设置用户的渠道等级
+            buildCooperationTagVO(userAccountSimpleDTOS);
+            return userAccountSimpleDTOS;
+        }
+        return null;
+    }
+
+    @Override
     public List<UserAccountSimpleDTO> feignListRcdUserInfo(List<Integer> userIds) {
         List<UserAccountDO> userAccountDOS = userServiceDao.feignListRcdUserInfo(userIds);
         if (!CollectionUtils.isEmpty(userAccountDOS)) {

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

@@ -15,6 +15,7 @@
         <result property="remark" column="remark"/>
         <result property="createTime" column="create_time"/>
         <result property="tagName" column="tag_name"/>
+        <result property="orderNo" column="order_no"/>
 
         <association property="companyInfoDO" javaType="com.mmc.iuav.user.entity.CompanyInfoDO">
             <id property="id" column="company_info_id"/>
@@ -151,6 +152,7 @@
                ua.apply_status,
                ua.remark,
                ua.create_time,
+               ua.order_no,
                ct.tag_name,
                ci.id AS company_info_id,
                ci.company_name,

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

@@ -640,4 +640,18 @@
           AND cm.is_leader = 1
     </select>
 
+    <select id="listAllUserAccountByIds" resultType="com.mmc.iuav.user.entity.UserAccountDO">
+        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, ca.auth_status as companyAuthStatus,
+        ca.company_name
+        from user_account ua left join company_auth ca on ua.id = ca.user_account_id
+        where 1 = 1
+        <if test=" userIds != null ">
+            <foreach collection="userIds" item="id" open="and ua.id in (" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+    </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: dbe36a6d3029968c8b27894f140f3a5f0c9d631f
+  newTag: ae0c127105ad046db3572326d1c1dfc81775a6f5