From 5e179f4180fd2dc93623699af614df9a2497ded6 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 25 Sep 2025 02:27:38 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 b6b67df..4919ac7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
@@ -352,7 +352,7 @@
userTeamAndPositionOut.setInsureNumber(activeNumber);
positions.forEach(f->{
- if(userPolicyList.size() >= f.getNumberPeople()){
+ if(activeNumber >= f.getNumberPeople()){
userTeamAndPositionOut.setPosition(f.getPosition());
userTeamAndPositionOut.setSalary(f.getSalary());
}
@@ -381,12 +381,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