Merge branch 'develop'

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

+package com.mmc.iuav.user.model.vo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserRcdUpVO {
+
+    private Integer rUerId;
+
+    private List<Integer> userId;
+}
\ No newline at end of file

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

@@ -5,11 +5,14 @@ import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.model.qo.CompanyInfoQO;
 import com.mmc.iuav.user.model.vo.CompanyInfoVO;
 import com.mmc.iuav.user.model.vo.UserAccountVO;
+import com.mmc.iuav.user.model.vo.UserRcdUpVO;
+import com.mmc.iuav.user.model.vo.UserRcdVO;
 import com.mmc.iuav.user.service.CompanyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -138,4 +141,12 @@ public class CompanyController extends BaseController {
     public ResultBody getManagerIdByBackUserId(@RequestParam Integer backUserAccountId) {
         return companyService.getManagerIdByBackUserId(backUserAccountId);
     }
+
+    @ApiOperation(value = "添加邀请人数")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("insertUserRcd")
+    public ResultBody insertUserRcd(@RequestBody UserRcdUpVO userRcdUpVO) {
+        return  companyService.insertUserRcd(userRcdUpVO.getRUerId(),userRcdUpVO.getUserId());
+
+    }
 }

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

@@ -205,4 +205,13 @@ public interface CompanyDao {
     CompanyMemberDO getManagerByCompanyId(Integer companyInfoId);
 
     CompanyBackUserDO getCompanyBackUserByBackUserId(Integer backUserAccountId);
+
+    /**
+     * 从旧版云享飞搜索添加到新版云享飞
+     * @param userId 被邀请人
+     * @param rUserId 邀请人
+     */
+    void insertUserRcd(Integer userId,Integer rUserId);
+
+    Integer selectUserByUserRcd(Integer userId);
 }

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

@@ -170,4 +170,6 @@ public interface CompanyService {
     void deleteCompanyInfoById(Integer id);
 
     ResultBody getManagerIdByBackUserId(Integer backUserAccountId);
+
+    ResultBody insertUserRcd(Integer rUserId,List<Integer> userIds);
 }

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

@@ -291,4 +291,18 @@ public class CompanyServiceImpl implements CompanyService {
         }
         return ResultBody.success(companyMemberDO.getUserAccountId());
     }
+
+    @Override
+    public ResultBody insertUserRcd(Integer rUserId, List<Integer> userIds) {
+        for (Integer userId : userIds) {
+            Integer integer = companyDao.selectUserByUserRcd(userId);
+            if(integer != 0){
+                continue;
+            }
+            companyDao.insertUserRcd(userId,rUserId);
+        }
+        return ResultBody.success();
+    }
+
+
 }

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

@@ -21,6 +21,9 @@
         insert into company_member(user_account_id, company_info_id, is_leader, create_time)
         values (#{userAccountId}, #{companyInfoId}, #{leader}, NOW())
     </insert>
+    <insert id="insertUserRcd">
+        insert into user_rcd(user_account_id,rcd_user_id,create_time) values (#{userId},#{rUserId},NOW())
+    </insert>
 
     <update id="removeCompanyInfo">
         update company_info set is_deleted = 1 where id = #{id}
@@ -278,4 +281,7 @@
             company_member cm
         where company_info_id = #{companyInfoId} and is_leader = 1
     </select>
+    <select id="selectUserByUserRcd" resultType="java.lang.Integer">
+        select count(id) from user_rcd where user_account_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: ff5a5c0c19280fd1e4cf559711f86eec00304dd3
+  newTag: 6efcd8d5e996e5ce8112e0fdb849fdbe61d1266d