From 553411d7a2579c87a06cf89769e61923a825c7a8 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 21 Sep 2025 03:41:25 +0800
Subject: [PATCH] 1

---
 ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java                       |   18 ++++++++++++++++++
 ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserKycDto.java            |    4 ++--
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserKycController.java |    4 +++-
 ruoyi-admin/src/main/resources/application.yml                                    |    2 +-
 4 files changed, 24 insertions(+), 4 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 b9c5693..afe9714 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
@@ -5,15 +5,18 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.dto.RegisterDto;
+import com.ruoyi.im.service.InsuranceProductService;
 import com.ruoyi.im.util.SymmetricCryptoUtil;
 import com.ruoyi.im.util.ValidatorUtil;
 import com.ruoyi.system.domain.GroupWelcomeConfig;
+import com.ruoyi.system.domain.InsuranceProduct;
 import com.ruoyi.system.domain.IpBlacklist;
 import com.ruoyi.system.domain.UserAccount;
 import com.ruoyi.system.domain.vo.UserAccountUpdateVo;
@@ -56,6 +59,9 @@
     UserAccountService userAccountService;
     @Autowired
     GroupWelcomeConfigService groupWelcomeConfigService;
+
+    @Autowired
+    InsuranceProductService insuranceProductService;
 
 
 
@@ -239,6 +245,18 @@
         }
     }
 
+    /**
+     * 产品信息列表
+     */
+    @GetMapping("/list")
+    public Result list() {
+        LambdaQueryWrapper<InsuranceProduct> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(InsuranceProduct::getStatus, "ACTIVE");
+        // 按创建时间倒序排列
+        wrapper.orderByDesc(InsuranceProduct::getCreatedAt);
 
+        List<InsuranceProduct> list = insuranceProductService.list(wrapper);
+        return Result.success(list);
+    }
 
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserKycController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserKycController.java
index 49bd24e..3bc0d78 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserKycController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserKycController.java
@@ -43,7 +43,9 @@
     @Transactional
     public Result kycApply(UserKycDto dto) {
         try {
-            UserAccount userAccount = userAccountService.getById(dto.getUserId());
+            UserAccount userAccount = userAccountService
+                    .getOne(new LambdaQueryWrapper<UserAccount>()
+                            .eq(UserAccount::getAccount,dto.getAccount()));
             if(ObjectUtil.isEmpty(userAccount)){
                 return Result.error("请重新登录,未查询到你的信息!");
             }
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 45a5a3e..247322b 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -147,7 +147,7 @@
 
 file:
   upload-dir: /www/wwwroot/img
-  upload-prefix: https://img.freessl.help
+  upload-prefix: https://img.imgbt.net
 
 # 网易云信配置
 netease:
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserKycDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserKycDto.java
index 37d4de9..d167a63 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserKycDto.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserKycDto.java
@@ -11,8 +11,8 @@
 public class UserKycDto {
 
     // 系统生成的用户ID
-    @NotEmpty(message = "用户id不能为空")
-    private Integer userId;
+    @NotEmpty(message = "用户账号不能为空")
+    private String account;
 
     //头像图片
     @NotEmpty(message = "头像图片不能为空")

--
Gitblit v1.9.3