From 79b5cc847355ec6f0ed90fe351c5a79628477aac Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 09 Oct 2025 18:35:14 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java | 89 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 73 insertions(+), 16 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 c5a41bb..e2a80dd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
@@ -3,21 +3,15 @@
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.im.comm.Result;
import com.ruoyi.im.config.IpUtils;
import com.ruoyi.im.dto.UpdateUserBusinessDto;
-import com.ruoyi.im.service.ImApiServcie;
+import com.ruoyi.im.service.*;
import com.ruoyi.im.dto.RegisterDto;
-import com.ruoyi.im.service.InsuranceProductService;
-import com.ruoyi.im.service.MedicalInsuranceAccountService;
-import com.ruoyi.im.service.UserPolicyService;
import com.ruoyi.im.service.impl.InsurancePositionServiceImpl;
-import com.ruoyi.im.util.SymmetricCryptoUtil;
+import com.ruoyi.im.util.PayService;
+import com.ruoyi.im.util.SimplePayUtil;
import com.ruoyi.im.util.UserPolicyUtils;
import com.ruoyi.im.util.ValidatorUtil;
import com.ruoyi.system.domain.*;
@@ -26,15 +20,11 @@
import com.ruoyi.system.domain.out.UserTeamAndPositionOut;
import com.ruoyi.system.domain.vo.UserAccountUpdateVo;
import com.ruoyi.system.service.GroupWelcomeConfigService;
-import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.IpBlacklistService;
import com.ruoyi.system.service.UserAccountService;
-import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -79,12 +69,19 @@
@Autowired
InsurancePositionServiceImpl insurancePositionService;
+ @Autowired
+ UserKycService userKycService;
+
+ @Autowired
+ InsuranceFeatureService insuranceFeatureService;
@Value("${file.upload-dir}")
private String uploadDir;
@Value("${file.upload-prefix}")
private String prefix;
+
+
/**
@@ -131,7 +128,7 @@
@PostMapping("/updateUser")
public Result updateUser(UserAccountUpdateVo vo){
try {
- UserAccount userAccount = userAccountService.getOne(new LambdaQueryWrapper<UserAccount>().eq(UserAccount::getAccount,vo.getAccountId()));
+ UserAccount userAccount = userAccountService.getOne(new LambdaQueryWrapper<UserAccount>().eq(UserAccount::getAccount,vo.getAccount()));
if (StringUtils.isNotBlank(vo.getNickname())) {
userAccount.setNickname(vo.getNickname());
@@ -287,7 +284,17 @@
if(ObjectUtil.isEmpty(userAccount)){
return Result.error("账号不存在！");
}
+
+ GroupWelcomeConfig groupWelcomeConfig = groupWelcomeConfigService.getOne(new LambdaQueryWrapper<>(GroupWelcomeConfig.class)
+ .eq(GroupWelcomeConfig::getConfigurationName, "IM-BASICS").last(" limit 1"));
+
UserOut user = new UserOut();
+ if(ObjectUtil.isNotEmpty(groupWelcomeConfig)){
+ user.setCustomerServiceUrl(groupWelcomeConfig.getCustomerServiceUrl());
+ user.setAboutUs(groupWelcomeConfig.getAboutUs());
+ }
+ user.setBalance(userAccount.getBalance());
+
MedicalInsuranceAccount insuranceAccount = medicalInsuranceAccountService.getOne(new LambdaQueryWrapper<>(MedicalInsuranceAccount.class)
.eq(MedicalInsuranceAccount::getUserId, userAccount.getId())
.eq(MedicalInsuranceAccount::getAccountStatus, MedicalInsuranceAccount.AccountStatus.ACTIVE)
@@ -298,6 +305,8 @@
}
user.setAmountClaimed(insuranceAccount.getAmountClaimed());
user.setAlreadyReceived(insuranceAccount.getAlreadyReceived());
+ user.setGroupPermissions(userAccount.getGroupPermissions());
+ user.setAddFriend(userAccount.getAddFriend());
return Result.success(user);
}catch (Exception e){
log.error("获取失败：",e);
@@ -320,7 +329,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()
@@ -344,9 +357,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());
}
@@ -355,4 +368,48 @@
userTeamAndPositionOut.setSubordinateInformation(informationDtos);
return Result.success(userTeamAndPositionOut);
}
+
+ /**
+ * 获取用户实名认证
+ */
+ @GetMapping("/getUserKyc")
+ public Result getUserKyc(@RequestParam("account") String account) {
+ UserAccount userAccount = userAccountService.getOne(new LambdaQueryWrapper<>(UserAccount.class).eq(UserAccount::getCloudMessageAccount, account));
+ if(ObjectUtil.isEmpty(userAccount)){
+ return Result.error("账号不存在！");
+ }
+ UserKyc userKyc = userKycService.getOne(new LambdaQueryWrapper<>(UserKyc.class)
+ .eq(UserKyc::getUserId, userAccount.getId())
+ );
+ return Result.success(userKyc);
+ }
+
+ /**
+ * 产品信息列表
+ */
+ @GetMapping("/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);
+ });
+ return Result.success(list);
+ }
}
--
Gitblit v1.9.3