From f0f6bd6f7499d1fa737f705091337befb98f5112 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 28 九月 2023 18:33:31 +0800
Subject: [PATCH] 后台
---
cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java | 71 ++++++++++++++++++++++++++++-------
1 files changed, 57 insertions(+), 14 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 e3b035a..707bea3 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
@@ -1,24 +1,24 @@
package com.dsh.account.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsh.account.dto.CreateHistoryDto;
-import com.dsh.account.dto.GetHistoryDto;
-import com.dsh.account.dto.StudentSearch;
-import com.dsh.account.dto.TStudentDto;
+import com.dsh.account.dto.*;
+import com.dsh.account.entity.Coach;
+import com.dsh.account.entity.GiftSearchDto;
import com.dsh.account.entity.TStudent;
+import com.dsh.account.feignclient.course.CoursePaymentClient;
+import com.dsh.account.feignclient.course.model.TCoursePackagePayment;
import com.dsh.account.model.StudentVo;
-import com.dsh.account.service.TAppUserService;
import com.dsh.account.service.TStudentService;
import com.dsh.account.util.ResultUtil;
import com.dsh.account.util.TokenUtil;
-import io.micrometer.core.instrument.search.Search;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import jdk.nashorn.internal.ir.annotations.Ignore;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import springfox.documentation.swagger2.mappers.ModelMapper;
+import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -38,7 +38,16 @@
@Autowired
private TokenUtil tokenUtil;
-
+ /**
+ * 添加学员
+ * @return
+ */
+ @RequestMapping("/base/student/addStudent")
+ public Object addStudent(@RequestBody TStudent student){
+ student.setInsertTime(new Date());
+ student.setIsDefault(1);
+ return studentService.save(student);
+ }
/**
* 获取用户学员列表
* @param appUserId
@@ -62,7 +71,7 @@
@PostMapping("/student/queryDefaultStudent")
public TStudent queryDefaultStudent(@RequestBody Integer appUserId){
try {
- TStudent one = studentService.getOne(new QueryWrapper<TStudent>().eq("appUserId", appUserId).eq("isDefault", 1).eq("state", 1));
+ TStudent one = studentService.getOne(new QueryWrapper<TStudent>().eq("appUserId", appUserId).eq("isDefault", 1).eq("state", 1).last("limit 1"));
return one;
}catch (Exception e){
e.printStackTrace();
@@ -133,6 +142,8 @@
}
+
+
/**
* 根据名称模糊搜索学员
* @param name
@@ -141,6 +152,15 @@
@ResponseBody
@PostMapping("/student/queryStudentListByName")
public List<TStudent> queryStudentListByName(@RequestBody String name){
+ return studentService.list(new QueryWrapper<TStudent>().eq("state", 1).like("name", name));
+ }
+ /**
+ * 根据名称模糊搜索学员
+ * @param name
+ * @return
+ */
+ @PostMapping("/student/queryTStudentListByName")
+ public List<TStudent> queryTStudentListByName(@RequestBody String name){
return studentService.list(new QueryWrapper<TStudent>().eq("state", 1).like("name", name));
}
@@ -175,17 +195,40 @@
public void createHistory(@RequestBody CreateHistoryDto createHistoryDto){
createHistoryDto.setDate(new Date());
studentService.createHistory(createHistoryDto);
-
-
}
-
@ResponseBody
@PostMapping("/student/getHisory")
public List<GetHistoryDto> getHisory(){
-
List<GetHistoryDto> getHistoryDtos = studentService.getHistory();
-
return getHistoryDtos;
}
+
+
+ @Resource
+ private CoursePaymentClient paymentClient;
+ @ResponseBody
+ @PostMapping("/student/giftSelect")
+ public List<SelectDto> giftSelect(@RequestBody GiftSearchDto giftSearchDto){
+ System.out.println("======giftSelect=========giftSearchDto===="+giftSearchDto);
+
+// 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()));
+
+
+ List<SelectDto> list = new ArrayList<>();
+ for (TStudent student : selectDtos) {
+ SelectDto selectDto = new SelectDto();
+ selectDto.setValue(student.getName());
+ selectDto.setId(student.getId());
+ list.add(selectDto);
+ }
+ System.out.println("=======giftSelect======selectDtos====>"+list);
+ return list;
+ }
}
--
Gitblit v1.7.1