From 1cb12391db6154f2d1a8fdf8e0506fe3f3eb2f15 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期日, 08 十月 2023 16:19:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java | 150 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 141 insertions(+), 9 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 5341278..b7c7d88 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,15 +1,21 @@
package com.dsh.account.controller;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.account.dto.*;
-import com.dsh.account.entity.GiftSearchDto;
-import com.dsh.account.entity.TStudent;
+import com.dsh.account.entity.*;
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.StudentVo;
+import com.dsh.account.service.IVipPaymentService;
+import com.dsh.account.service.RechargeRecordsService;
+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 com.dsh.account.util.ToolUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -18,10 +24,13 @@
import springfox.documentation.swagger2.mappers.ModelMapper;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -37,7 +46,25 @@
@Autowired
private TokenUtil tokenUtil;
+ @Autowired
+ private TAppUserService appUserService;
+ @Autowired
+ private IVipPaymentService vipPaymentService;
+
+ @Autowired
+ private RechargeRecordsService rechargeRecordsService;
+
+ /**
+ * 添加学员
+ * @return
+ */
+ @RequestMapping("/base/student/addStudent")
+ public Object addStudent(@RequestBody TStudent student){
+ student.setInsertTime(new Date());
+ student.setIsDefault(1);
+ return studentService.save(student);
+ }
/**
* 获取用户学员列表
* @param appUserId
@@ -61,7 +88,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();
@@ -144,6 +171,15 @@
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));
+ }
/**
* web端查找学员
@@ -176,17 +212,12 @@
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;
}
@@ -199,7 +230,7 @@
System.out.println("======giftSelect=========giftSearchDto===="+giftSearchDto);
// Integer appId = studentService.getGiftSelect(giftSearchDto);
- TCoursePackagePayment coursePackagePaymentById = paymentClient.getCoursePackagePaymentById(giftSearchDto.getId());
+ TCoursePackagePayment1 coursePackagePaymentById = paymentClient.getCoursePackagePaymentById1(giftSearchDto.getId());
// System.out.println("=======giftSelect======appId====>"+appId);
List<TStudent> selectDtos = studentService.list(new QueryWrapper<TStudent>()
.select("name, id")
@@ -217,4 +248,105 @@
System.out.println("=======giftSelect======selectDtos====>"+list);
return list;
}
+
+
+ @PostMapping("/student/getUserPt")
+ @ResponseBody
+ public List<Integer> getUserPt(@RequestBody List<Integer> ids){
+ if(ids.size()==0){
+ ids.add(-1);
+ }
+ List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().in(TAppUser::getInsertType, 1));
+ return list.stream().map(TAppUser::getId).collect(Collectors.toList());
+ }
+
+
+ @PostMapping("/student/queryFee")
+ public HashMap<String, Object> queryFee(@RequestBody QueryDataFee queryDataFee){
+ HashMap<String, Object> map = new HashMap<>();
+ String data = queryDataFee.getData();
+ List<Integer> ids = queryDataFee.getIds();
+ if(ids.size()==0){
+ ids.add(-1);
+ }
+ LambdaQueryWrapper<VipPayment> vipPaymentLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ if(ToolUtil.isNotEmpty(data)){
+ String stime = data.split(" - ")[0]+" 00:00:00";
+ String etime = data.split(" - ")[1]+" 23:59:59";
+ vipPaymentLambdaQueryWrapper.between(VipPayment::getInsertTime,stime,etime);
+ }
+ vipPaymentLambdaQueryWrapper.in(VipPayment::getAppUserId,ids);
+ vipPaymentLambdaQueryWrapper.eq(VipPayment::getPayStatus,2);
+ List<VipPayment> list = vipPaymentService.list(vipPaymentLambdaQueryWrapper);
+ double sum = list.stream().mapToDouble(VipPayment::getAmount).sum();
+
+ map.put("fee1",sum);
+
+ LambdaQueryWrapper<RechargeRecords> rechargeRecordsLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ if(ToolUtil.isNotEmpty(data)){
+ String stime = data.split(" - ")[0]+" 00:00:00";
+ String etime = data.split(" - ")[1]+" 23:59:59";
+ rechargeRecordsLambdaQueryWrapper.between(RechargeRecords::getInsertTime,stime,etime);
+ }
+ rechargeRecordsLambdaQueryWrapper.in(RechargeRecords::getAppUserId,ids);
+ rechargeRecordsLambdaQueryWrapper.eq(RechargeRecords::getPayStatus,2);
+ List<RechargeRecords> list1 = rechargeRecordsService.list(rechargeRecordsLambdaQueryWrapper);
+ double sum1 = list1.stream().map(RechargeRecords::getAmount).reduce(BigDecimal.ZERO,BigDecimal::add).doubleValue();
+
+ map.put("fee2",sum1);
+
+
+
+
+ return map;
+
+
+ }
+
+
+
+ @PostMapping("/student/queryUserAge")
+ public HashMap<String, Object> queryUserAge(){
+ HashMap<String, Object> map = new HashMap<>();
+ List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().in(TAppUser::getInsertType, 1));
+ List<Integer> collect = list.stream().map(TAppUser::getId).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add(-1);
+ }
+ List<TStudent> list1 = studentService.list(new LambdaQueryWrapper<TStudent>().in(TStudent::getAppUserId, collect));
+ int age1=0;
+ int age2=0;
+ int age3=0;
+ int age4=0;
+ int boy=0;
+ int girl=0;
+ for (TStudent tStudent : list1) {
+ Date birthday = tStudent.getBirthday();
+ long l = DateUtil.betweenYear(birthday, new Date(), true);
+ if(l<7){
+ age1++;
+ }else if(l>=8 && l<11){
+ age2++;
+ }else if(l>=11 && l<=12){
+ age3++;
+ }else {
+ age4++;
+ }
+ if(tStudent.getSex()==1){
+ boy++;
+ }else {
+ girl++;
+ }
+ }
+ map.put("age1",age1);
+ map.put("age2",age2);
+ map.put("age3",age3);
+ map.put("age4",age4);
+ map.put("boy",boy);
+ map.put("girl",girl);
+ return map;
+
+
+
+ }
}
--
Gitblit v1.7.1