Merge remote-tracking branch 'origin/develop' into develop

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

@@ -200,4 +200,6 @@ public interface UserServiceDao {
     UserAccountMessageVo userMessages(Integer userAccountId);
 
     List<String> userMessagesPilot(Integer pilotId);
+
+    List<UserAccountDO> listAllUserAccountByIds(@Param("userIds") List<Integer> ids);
 }

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

@@ -22,9 +22,10 @@ public class ActivityPartDO implements Serializable {
     private Integer userAccountId;
     private Integer pUserAccountId;
     private Date createTime;
+    private Integer rewardValue;
 
     public ActivityPartDTO buildActivityPartDTO() {
         return ActivityPartDTO.builder().id(this.id).activityId(this.activityId).userAccountId(this.userAccountId)
-                .pUserAccountId(this.pUserAccountId).createTime(this.createTime).build();
+                .pUserAccountId(this.pUserAccountId).createTime(this.createTime).rewardValue(this.rewardValue).build();
     }
 }

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/fdd/impl/UserFddAuthServiceImpl.java

@@ -111,7 +111,7 @@ public class UserFddAuthServiceImpl implements UserFddAuthService {
 //        params.setBankCardNo(""); //个人银行卡
 //        params.setOption(""); //不传默认add
 //        params.setIdPhotoOptional(""); //是否需要上传身份照片
-//        params.setIsMinProgram(""); //是否跳转法大大公证处小程序认证
+        params.setIsMinProgram("3"); //是否跳转法大大公证处小程序认证
 //        params.setLang("zh"); //zh：中文；en：英文
 //        params.setIsAllowOverseasBankCardAuth(""); //海外用户是否支持银行卡认证
 //        params.setIdentFrontImg(new File("")); //证件正面照图片文件

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/UserAccountServiceImpl.java

@@ -230,7 +230,7 @@ public class UserAccountServiceImpl implements UserAccountService {
             return ResultBody.success();
         }
         String userPhoneNumber = wxService.getUserPhoneNumber(id, code);
-        log.info("授权手机号，用户：{}，手机号：{}", id, userPhoneNumber);
+        log.info("授权手机号，用户：{}，手机号：{}，上级推荐人:{}", id, userPhoneNumber, rcdUserId);
         if (StringUtils.isBlank(userPhoneNumber)) {
             return ResultBody.error(ResultEnum.AUTH_PHONE_NUMBER_ERROR);
         }
@@ -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/UserServiceDao.xml

@@ -637,4 +637,18 @@
             pilot_certification_id = #{pilotId}
     </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: 3d30e4206dee34e1b1fba6f78d400a80827e9203
+  newTag: 2c1f558b5b4094fee5f953db291318b7d43bf96b