From 695ff7ec8bd12b6cf32b77902bd5cfb44419b835 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 17 十一月 2023 09:06:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
index 08b4512..5de9b6b 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
@@ -63,6 +63,15 @@
return studentService.save(student);
}
/**
+ * 获取有学员的用户ids
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/student/getHasStudentUser")
+ public List<Integer> getHasStudentUser(){
+ return studentService.list(new QueryWrapper<TStudent>()).stream().map(TStudent::getAppUserId).distinct().collect(Collectors.toList());
+ }
+ /**
* 获取用户学员列表
* @param appUserId
* @return
@@ -266,16 +275,16 @@
@PostMapping("/student/giftSelect")
public List<SelectDto> giftSelect(@RequestBody GiftSearchDto giftSearchDto){
System.out.println("======giftSelect=========giftSearchDto===="+giftSearchDto);
+ TAppUser one = appUserService.getOne(new QueryWrapper<TAppUser>().eq("name", giftSearchDto.getName())
+ .eq("phone", giftSearchDto.getPhone()));
+
// Integer appId = studentService.getGiftSelect(giftSearchDto);
TCoursePackagePayment1 coursePackagePaymentById = paymentClient.getCoursePackagePaymentById1(giftSearchDto.getId());
// System.out.println("=======giftSelect======appId====>"+appId);
List<TStudent> selectDtos = studentService.list(new QueryWrapper<TStudent>()
- .select("name, id")
.eq("state", 1)
- .eq("name", giftSearchDto.getName()).eq("phone",giftSearchDto.getPhone()).ne("appUserId",coursePackagePaymentById.getAppUserId()));
-
-
+ .eq("appUserId",one.getId()));
List<SelectDto> list = new ArrayList<>();
for (TStudent student : selectDtos) {
SelectDto selectDto = new SelectDto();
--
Gitblit v1.7.1