From 1863e6353f0de84082a21738f5d0a28f3cfeadc0 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 十一月 2023 19:33:49 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java | 79 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 11 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
index 1dffead..455abe7 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
@@ -1,15 +1,21 @@
package com.dsh.guns.modular.system.controller.system;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.course.dto.*;
import com.dsh.course.entity.EvaluateStudent;
import com.dsh.course.feignClient.account.AppUserClient;
import com.dsh.course.feignClient.account.StudentClient;
import com.dsh.course.feignClient.account.model.TAppUser;
+import com.dsh.course.feignClient.competition.CompetitionClient;
+import com.dsh.course.feignClient.competition.model.ListQuery;
import com.dsh.course.feignClient.course.CoursePackageClient;
+import com.dsh.course.feignClient.course.CoursePackagePaymentClient;
import com.dsh.course.feignClient.course.CourseStuddentClient;
import com.dsh.course.feignClient.course.model.TCoursePackage;
import com.dsh.course.feignClient.course.model.TCoursePackagePayment;
+import com.dsh.course.feignClient.other.BallClient;
import com.dsh.course.feignClient.other.HistoryClient;
import com.dsh.course.model.MoneyBack;
import com.dsh.course.model.dto.InsertBackDto;
@@ -18,12 +24,9 @@
import com.dsh.course.util.HtmlToPdfUtils;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.modular.system.model.CourseCounsum;
-import com.dsh.guns.modular.system.model.TStudent;
-import com.dsh.guns.modular.system.model.User;
+import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.model.dto.*;
-import com.dsh.guns.modular.system.service.EvaluateStudentService;
-import com.dsh.guns.modular.system.service.ITStudentService;
+import com.dsh.guns.modular.system.service.*;
import com.dsh.guns.modular.system.util.BigDecimalToChineseAmountUtil;
import com.dsh.guns.modular.system.util.ResultUtil;
import io.swagger.models.auth.In;
@@ -46,6 +49,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 控制器
@@ -67,7 +71,14 @@
@Resource
private HistoryClient historyClient;
-
+ @Autowired
+ private IStoreService storeService;
+ @Autowired
+ private CompetitionClient competitionClient;
+ @Autowired
+ private ICityService cityService;
+ @Autowired
+ private CoursePackagePaymentClient coursePackagePaymentClient;
@RequestMapping("download")
public void down(HttpServletRequest request, HttpServletResponse response) throws IOException {
@@ -122,6 +133,8 @@
public String index(Model model) {
Integer objectType = UserExt.getUser().getObjectType();
model.addAttribute("objectType",objectType);
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list);
return PREFIX + "tStudent.html";
}
@@ -279,6 +292,19 @@
System.out.println("======>t"+tStudentId);
//查询学员信息
TStudentDto tStudentDto = itStudentService.listOne(tStudentId);
+ // 查询该学员第一次购买课包的时间
+ String time = coursePackagePaymentClient.getTime(tStudentId);
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ try {
+ if (time!=null){
+ Date parse = format.parse(time);
+ tStudentDto.setTime(parse);
+ }
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+
+
model.addAttribute("item", tStudentDto);
if (tStudentDto.getLateralSurface()!=null) {
String[] pics = tStudentDto.getLateralSurface().split(";");
@@ -334,6 +360,10 @@
return new ResultUtil<>(0,0,null,map,null);
}
+ @Autowired
+ private ISiteBookingService siteBookingService;
+ @Autowired
+ private BallClient ballClient;
/**
* 获取列表
*/
@@ -350,11 +380,38 @@
search.setIds(ids);
}
if(UserExt.getUser().getObjectType()==2){
+ // 获取运营商下的所有门店id集合
+ List<Integer> storeIds = storeService.list(new QueryWrapper<TStore>()
+ .eq("operatorId", UserExt.getUser().getObjectId()))
+ .stream().map(TStore::getId).collect(Collectors.toList());
+ // 根据门店id集合查询 属于该运营商下的门店举办的赛事
+ ListQuery listQuery = new ListQuery();
+ listQuery.setIds(storeIds);
+ // 通过门店ids 获取赛事的支付记录 获取到用户的ids
+ List<Integer> list = competitionClient.getUserIds(listQuery);
+
+ // 获取场地预约记录 拿到用户ids
+ List<Integer> siteUsers = siteBookingService.list(new QueryWrapper<SiteBooking>().in("storeId", storeIds))
+ .stream().map(SiteBooking::getAppUserId).collect(Collectors.toList());
+ // 获取课程购买记录 拿到用户ids
+ List<Integer> cpUsers = coursePackageClient.getCoursePackageByStoreIds(storeIds);
+ // 获取游戏记录 拿到用户ids
+ List<Integer> gameUsers = ballClient.getGameByStoreIds(storeIds);
+ // 用户ids
+ List<Integer> users = new ArrayList<>();
+ users.addAll(list);
+ users.addAll(siteUsers);
+ users.addAll(cpUsers);
+ users.addAll(gameUsers);
+ // 去重后的用户id
+ List<Integer> collect = users.stream().distinct().collect(Collectors.toList());
ids = appUserClient.getUserYYs(UserExt.getUser().getObjectId());
+ ids.addAll(collect);
+ List<Integer> collect1 = ids.stream().distinct().collect(Collectors.toList());
if(ids.size()==0){
ids.add(-1);
}
- search.setIds(ids);
+ search.setIds(collect1);
}
System.out.println("============学员查询接口=========");
return itStudentService.listAll(search);
@@ -406,12 +463,12 @@
@RequestMapping("/updatecom")
@ResponseBody
- public ResultUtil updatecom(Integer id,String content,String images) {
+ public ResultUtil updatecom(@RequestBody StudentPingYuDTO dto) {
EvaluateStudent evaluateStudent = new EvaluateStudent();
- evaluateStudent.setId(id);
- evaluateStudent.setContent(content);
- evaluateStudent.setImgs(images);
+ evaluateStudent.setId(dto.getId());
+ evaluateStudent.setContent(dto.getContent());
+ evaluateStudent.setImgs(dto.getImages());
appUserClient.save(evaluateStudent);
// evaluateStudentService.updateById(evaluateStudent);
--
Gitblit v1.7.1