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 | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 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 0784709..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,15 +2,13 @@
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;
@@ -18,12 +16,18 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestBody;
+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
@@ -89,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