From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TIntroductionCourtesyController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TIntroductionCourtesyController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TIntroductionCourtesyController.java
index 9f3ecf9..2db795a 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TIntroductionCourtesyController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TIntroductionCourtesyController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dsh.course.feignClient.account.AppUserClient;
import com.dsh.course.feignClient.account.model.TAppUser;
import com.dsh.course.feignClient.activity.IntroduceClient;
import com.dsh.course.feignClient.activity.model.IntroduceRewards;
@@ -35,6 +36,8 @@
private ICityService cityService;
@Autowired
private IntroduceClient introduceClient;
+ @Autowired
+ private AppUserClient appUserClient;
/**
* 上/下架 1为上架 2为下架
@@ -66,6 +69,7 @@
model.addAttribute("id",id);
return PREFIX + "introduce_user.html";
}
+
/**
* 介绍有礼添加页
*/
@@ -103,17 +107,21 @@
@RequestMapping(value = "/listAll")
@ResponseBody
public List<IntroduceVO> listAll(IntroduceQuery query) {
-
- return introduceClient.listAll(query);
+ List<IntroduceVO> list = introduceClient.listAll(query);
+ for (IntroduceVO introduceVO : list) {
+ Integer activityPeoples = appUserClient.getActivityPeoples(introduceVO.getId());
+ introduceVO.setNumber(activityPeoples);
+ }
+ return list;
}
/**
- * 获取介绍有礼记录列表
+ * 获取介绍有礼--参与用户记录列表
*/
@RequestMapping(value = "/listAllUser")
@ResponseBody
public List<IntroduceUser> listAll(IntroduceUserQuery query) {
- return introduceClient.listAllUser(query);
+ return appUserClient.queryIntroduceAll(query);
}
/**
* 新增介绍有礼记录表
@@ -122,6 +130,7 @@
@RequestMapping("/addIntroduce")
@ResponseBody
public Object addAppUser(@RequestBody IntroduceRewards introduceRewards){
+
return introduceClient.addIntroduce(introduceRewards);
}
}
--
Gitblit v1.7.1