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 |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 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 0e0dfae..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
@@ -9,7 +9,12 @@
 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.*;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,6 +24,24 @@
 @FeignClient("mb-cloud-account")
 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);
     /**
      *  后台添加
      */
@@ -70,4 +93,6 @@
 
     @PostMapping("/student/getHisory")
     List<GetHistoryDto> getHisory();
+    @PostMapping("/student/giftSelect")
+    List<SelectDto> giftSelect(@RequestBody GiftSearchDto giftSearchDto);
 }

--
Gitblit v1.7.1