From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 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 4584afb..9160687 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
@@ -8,6 +8,7 @@
import com.dsh.account.feignclient.course.CoursePaymentClient;
import com.dsh.account.feignclient.course.model.TCoursePackagePayment;
import com.dsh.account.model.QueryDataFee;
+import com.dsh.account.model.Student;
import com.dsh.account.model.StudentVo;
import com.dsh.account.service.*;
import com.dsh.account.util.ResultUtil;
@@ -60,6 +61,15 @@
student.setInsertTime(new Date());
student.setIsDefault(1);
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());
}
/**
* 获取用户学员列表
@@ -173,6 +183,22 @@
}
+ @ResponseBody
+ @PostMapping("/student/queryById")
+ public TStudent queryById(@RequestBody Integer id) {
+ return studentService.getById(id);
+ }
+
+ @ResponseBody
+ @PostMapping("/base/appUser/updateTStudent")
+ public void updateTStudent(@RequestBody TStudent student){
+ try {
+ studentService.updateById(student);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
/**
* 根据id获取数据
* @param id
@@ -255,16 +281,14 @@
@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();
@@ -272,6 +296,8 @@
selectDto.setId(student.getId());
list.add(selectDto);
}
+ // 只筛选当前用户已经购买了这个课程的学员
+
System.out.println("=======giftSelect======selectDtos====>"+list);
return list;
}
--
Gitblit v1.7.1