From 1cf34bf75b4b6b091f0aea3d7f97f1c689e40fe5 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 13 Oct 2025 01:42:19 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 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 4919ac7..30859d4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
@@ -3,10 +3,6 @@
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;
@@ -14,7 +10,8 @@
import com.ruoyi.im.service.*;
import com.ruoyi.im.dto.RegisterDto;
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.*;
@@ -23,15 +20,12 @@
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.PaymentRecordService;
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.*;
@@ -82,11 +76,15 @@
@Autowired
InsuranceFeatureService insuranceFeatureService;
+
+
@Value("${file.upload-dir}")
private String uploadDir;
@Value("${file.upload-prefix}")
private String prefix;
+
+
/**
@@ -133,7 +131,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());
@@ -289,12 +287,24 @@
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)
);
user.setKycStatus(userAccount.getKycStatus());
+ user.setGroupPermissions(userAccount.getGroupPermissions());
+ user.setAddFriend(userAccount.getAddFriend());
if(ObjectUtil.isEmpty(insuranceAccount)){
return Result.success(user);
}
@@ -394,6 +404,7 @@
long count = userPolicyService.count(new LambdaQueryWrapper<>(UserPolicy.class)
.eq(UserPolicy::getUserId, userAccount.getId())
.eq(UserPolicy::getProductId,f.getId())
+ .eq(UserPolicy::getPayStatus,2)
.ne(UserPolicy::getApprovalStatus,2)
);
if(count > 0){
--
Gitblit v1.9.3