From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java
index bf46cef..c5f17e4 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java
@@ -2,16 +2,19 @@
import com.dsh.course.dto.CreateHistoryDto;
import com.dsh.course.dto.GetHistoryDto;
+import com.dsh.course.entity.EvaluateStudent;
import com.dsh.course.feignClient.account.model.*;
import com.dsh.course.dto.StudentSearch;
import com.dsh.course.dto.TStudentDto;
import com.dsh.course.feignClient.other.model.SiteChangeStateVO;
-import com.dsh.guns.modular.system.model.AdvertisementChangeStateDTO;
-import com.dsh.guns.modular.system.model.AppUserByNameAndPhoneDTO;
-import com.dsh.guns.modular.system.model.TStudent;
+import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.model.dto.GiftSearchDto;
import com.dsh.guns.modular.system.model.dto.SelectDto;
+import com.dsh.guns.modular.system.util.ResultUtil;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestBody;
@@ -23,6 +26,16 @@
public interface AppUserClient {
+ /**
+ * 根据介绍有礼id查询当前活动参与次数
+ */
+ @PostMapping("/base/appUser/getActivityPeoples")
+ Integer getActivityPeoples(@RequestBody Integer activityId);
+ /**
+ * 介绍有礼 -- 参与用户列表
+ */
+ @PostMapping("/base/appUser/queryIntroduceAll")
+ List<IntroduceUser> queryIntroduceAll(@RequestBody IntroduceUserQuery query);
/**
* 根据用户姓名和电话模糊查询
*/
@@ -102,7 +115,46 @@
@PostMapping("/student/queryUserAge")
HashMap<String, Object> queryUserAge();
+ @PostMapping("/student/queryUserAge1")
+ HashMap<String, Object> queryUserAge1();
+ @PostMapping("/student/getUserYYs")
+ List<Integer> getUserYYs(Integer id);
+ @PostMapping("/student/queryUserAgeYys")
+ HashMap<String, Object> queryUserAgeYys(List<Integer> ids);
+ @PostMapping("/student/queryUserAgeStore")
+ HashMap<String, Object> queryUserAgeStore(List<Integer> ids);
+ @PostMapping("/student/queryUserAgeYys1")
+ HashMap<String, Object> queryUserAgeYys1(List<Integer> ids);
+ @PostMapping("/student/queryUserAgeStore1")
+ HashMap<String, Object> queryUserAgeStore1(List<Integer> ids);
+ @PostMapping("/student/getUserStore")
+ List<Integer> getUserStore(Integer id);
+ @PostMapping("/student/getUserYys")
+ List<Integer> getUserYys(Integer id);
+ @PostMapping("/student/getUserPtVip")
+ List<Integer> getUserPtVip();
+
+ @PostMapping("/student/userAndVipPt")
+ HashMap<String, Object> userAndVipPt(Integer type);
+
+ @PostMapping("/student/userAndVipYys")
+ HashMap<String, Object> userAndVipYys(List<Integer> ids);
+ @PostMapping("/student/userAndVipStore")
+ HashMap<String, Object> userAndVipStore(List<Integer> ids);
+ @PostMapping("/student/stuPt")
+ HashMap<String, Object> stuPt();
+ @PostMapping("/student/stuYys")
+ HashMap<String, Object> stuYys(@RequestBody List<Integer> ids);
+ @PostMapping("/student/stuStores")
+ HashMap<String, Object> stuStores(@RequestBody List<Integer> ids);
+
+ @PostMapping("/student/save")
+ void save(EvaluateStudent evaluateStudent);
+ @PostMapping("/student/comdel")
+ void comdel(@RequestBody Integer id);
+ @PostMapping("/student/updatePassWord")
+ void updatePassWord(@RequestBody List<String> strings);
}
--
Gitblit v1.7.1