From 6287f5366df7a0f13fef767ce7d6505979a13b22 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 25 Sep 2025 23:53:56 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
index 5aa4951..00a9973 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
@@ -298,6 +298,7 @@
if(ObjectUtil.isEmpty(insuranceAccount)){
return Result.success(user);
}
+ user.setBalance(userAccount.getBalance());
user.setAmountClaimed(insuranceAccount.getAmountClaimed());
user.setAlreadyReceived(insuranceAccount.getAlreadyReceived());
return Result.success(user);
@@ -322,7 +323,11 @@
.eq(UserAccount::getInvitationAccount, userAccount.getAccount())
);
UserTeamAndPositionOut userTeamAndPositionOut = new UserTeamAndPositionOut();
+
+ List<InsurancePosition> positions = insurancePositionService.list();
+
if(CollectionUtils.isEmpty(userAccountList)){
+ userTeamAndPositionOut.setInsurancePosition(positions);
return Result.success(userTeamAndPositionOut);
}
List<Integer> idList = userAccountList.stream()
@@ -346,9 +351,9 @@
long activeNumber = UserPolicyUtils.countActivePolicies(userPolicyList);
userTeamAndPositionOut.setInsureNumber(activeNumber);
- List<InsurancePosition> positions = insurancePositionService.list();
+
positions.forEach(f->{
- if(userPolicyList.size() >= f.getNumberPeople()){
+ if(activeNumber >= f.getNumberPeople()){
userTeamAndPositionOut.setPosition(f.getPosition());
userTeamAndPositionOut.setSalary(f.getSalary());
}
@@ -377,12 +382,24 @@
* 产品信息列表
*/
@GetMapping("/getProduct")
- public Result getProduct() {
+ public Result getProduct(@RequestParam("account") String account) {
+ UserAccount userAccount = userAccountService.getOne(new LambdaQueryWrapper<>(UserAccount.class).eq(UserAccount::getCloudMessageAccount, account));
+ if(ObjectUtil.isEmpty(userAccount)){
+ return Result.error("账号不存在！");
+ }
LambdaQueryWrapper<InsuranceProduct> wrapper = new LambdaQueryWrapper<>();
// 按创建时间倒序排列
wrapper.orderByDesc(InsuranceProduct::getCreatedAt);
List<InsuranceProduct> list = insuranceProductService.list(wrapper);
list.forEach(f->{
+ long count = userPolicyService.count(new LambdaQueryWrapper<>(UserPolicy.class)
+ .eq(UserPolicy::getUserId, userAccount.getId())
+ .eq(UserPolicy::getProductId,f.getId())
+ .ne(UserPolicy::getApprovalStatus,2)
+ );
+ if(count > 0){
+ f.setIsBuy(true);
+ }
List<InsuranceFeature> features = insuranceFeatureService.list(new LambdaQueryWrapper<InsuranceFeature>()
.eq(InsuranceFeature::getProductId, f.getId()));
f.setProductFeature(features);
--
Gitblit v1.9.3