From 02fb8cddb6c0ec60b6ba6d08beb673214d9b6959 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 25 九月 2023 17:26:21 +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 | 74 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 6 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 b567478..8be82ce 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,22 +1,24 @@
package com.dsh.account.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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;
@@ -36,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
@@ -131,6 +142,8 @@
}
+
+
/**
* 根据名称模糊搜索学员
* @param name
@@ -160,4 +173,53 @@
System.out.println("===?==》"+id);
return studentService.listOne(id);
}
+
+ @ResponseBody
+ @PostMapping("/student/update")
+ public void update(@RequestBody TStudent tStudent){
+ System.out.println("======tStudent======"+tStudent);
+ studentService.updateById(tStudent);
+ }
+
+ @ResponseBody
+ @PostMapping("/student/createHistory")
+ 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);
+ TCoursePackagePayment coursePackagePaymentById = paymentClient.getCoursePackagePaymentById(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