From 41c07e4558ed3a1cbdda0711f78cd3a812c06829 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 28 九月 2023 18:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 64 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 46c99a3..4605680 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
@@ -1,14 +1,23 @@
package com.dsh.course.feignClient.account;
+import com.dsh.course.dto.CreateHistoryDto;
+import com.dsh.course.dto.GetHistoryDto;
import com.dsh.course.feignClient.account.model.QueryAppUser;
import com.dsh.course.feignClient.account.model.QueryAppUserVO;
+
+import com.dsh.course.dto.StudentSearch;
+import com.dsh.course.dto.TStudentDto;
import com.dsh.course.feignClient.account.model.QueryByNamePhone;
import com.dsh.course.feignClient.account.model.TAppUser;
+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.dto.GiftSearchDto;
+import com.dsh.guns.modular.system.model.dto.SelectDto;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
@@ -16,11 +25,48 @@
public interface AppUserClient {
+ /**
+ * 根据用户姓名和电话模糊查询
+ */
+ @PostMapping("/base/appUser/queryAPPUserByNameAndPhone")
+ List<TAppUser> queryAPPUserByNameAndPhone(@RequestBody AppUserByNameAndPhoneDTO dto);
+ /**
+ * 根据用户id获取用户信息
+ * @param appUserId
+ * @return
+ */
+ @PostMapping("/base/appUser/queryAppUser1")
+ TAppUser queryAppUser1(@RequestBody Integer appUserId);
+ /**
+ * 冻结/解冻 1=解冻 2=冻结
+ */
+ @RequestMapping("/base/appUser/changeState")
+ Object changeState(@RequestBody AdvertisementChangeStateDTO dto);
+ /**
+ * 后台添加
+ */
+ @RequestMapping("/base/appUser/addAppUser1")
+ Object addAppUser1(@RequestBody TAppUser query);
+ /**
+ * 获取用户学员列表
+ * @param appUserId
+ * @return
+ */
+ @PostMapping("/student/queryStudentList")
+ List<TStudent> queryStudentList(@RequestBody Integer appUserId);
+ /**
+ * 根据用户手机号获取用户id
+ */
+ @GetMapping("/base/appUser/getAppUserByPhone/{phone}")
+ TAppUser getAppUserByPhone(@PathVariable("phone") String phone);
+
@PostMapping("/base/appUser/queryByNamePhone")
List<TAppUser> queryByNamePhone(QueryByNamePhone queryByNamePhone);
@PostMapping("/base/appUser/queryById")
TAppUser queryById(Integer appUserId);
+ @PostMapping("/student/webStudentList")
+ List<TStudentDto> queryWebUser(@RequestBody StudentSearch search);
/**
* 获取用户信息列表数据
@@ -34,4 +80,19 @@
Object addAppUser(@RequestBody TAppUser query);
+ @PostMapping("/student/webOneStudent")
+ TStudentDto queryOneWebUser(@RequestParam("id") Integer id);
+
+ @PostMapping("/student/update")
+ void updateStudent(TStudent tStudent);
+
+
+ @PostMapping("/student/createHistory")
+ void createHistory(CreateHistoryDto historyDto);
+
+
+ @PostMapping("/student/getHisory")
+ List<GetHistoryDto> getHisory();
+ @PostMapping("/student/giftSelect")
+ List<SelectDto> giftSelect(@RequestBody GiftSearchDto giftSearchDto);
}
--
Gitblit v1.7.1