From f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 20:03:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java |   90 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 81 insertions(+), 9 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 6016a36..d498192 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,29 +2,61 @@
 
 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.feignClient.account.model.*;
 
 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 org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.HashMap;
 import java.util.List;
 
 @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);
+    /**
+     *  后台添加
+     */
+    @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);
@@ -61,4 +93,44 @@
     List<GetHistoryDto> getHisory();
     @PostMapping("/student/giftSelect")
     List<SelectDto> giftSelect(@RequestBody GiftSearchDto giftSearchDto);
+
+    @PostMapping("/student/getUserPt")
+    List<Integer> getUserPt(List<Integer> ids);
+
+    @PostMapping("/student/queryFee")
+    HashMap<String, Object> queryFee(QueryDataFee queryDataFee);
+
+    @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(Integer id);
+    @PostMapping("/student/queryUserAgeStore")
+    HashMap<String, Object> queryUserAgeStore(Integer id);
+
+    @PostMapping("/student/queryUserAgeYys1")
+    HashMap<String, Object> queryUserAgeYys1(Integer id);
+    @PostMapping("/student/queryUserAgeStore1")
+    HashMap<String, Object> queryUserAgeStore1(Integer id);
+
+    @PostMapping("/student/getUserStore")
+    List<Integer> getUserStore(Integer id);
+    @PostMapping("/student/getUserPtVip")
+    List<Integer> getUserPtVip();
+
+    @PostMapping("/student/userAndVipPt")
+    HashMap<String, Object>  userAndVipPt(Integer type);
+
+    @PostMapping("/student/userAndVipYys")
+    HashMap<String, Object> userAndVipYys(Integer id);
+    @PostMapping("/student/userAndVipStore")
+    HashMap<String, Object> userAndVipStore(Integer id);
+    @PostMapping("/student/stuPt")
+    HashMap<String, Object> stuPt();
+
+
 }

--
Gitblit v1.7.1