From dfe52245f20a8177a0db0bc2841909fb3eab0f13 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 08 十一月 2023 09:07:05 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 1445 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 1,345 insertions(+), 100 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index c350bf2..8834457 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -5,21 +5,23 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.entity.*;
+import com.dsh.course.entity.TAppUser;
import com.dsh.course.feignclient.account.AppUserClient;
import com.dsh.course.feignclient.account.StudentClient;
import com.dsh.course.feignclient.account.model.AppUser;
import com.dsh.course.feignclient.account.model.Student;
import com.dsh.course.feignclient.account.model.TCourseInfoRecord;
+import com.dsh.course.feignclient.account.model.TStudent;
+import com.dsh.course.feignclient.activity.CouponClient;
+import com.dsh.course.feignclient.activity.model.Coupon;
import com.dsh.course.feignclient.model.*;
import com.dsh.course.feignclient.other.StoreClient;
import com.dsh.course.feignclient.other.model.Store;
-import com.dsh.course.model.BaseVo;
-import com.dsh.course.model.QueryRegistrationRecord;
-import com.dsh.course.model.QueryWalkInStudentList;
-import com.dsh.course.model.BillingRequest;
-import com.dsh.course.model.BillingRequestVo;
+import com.dsh.course.mapper.CoursePackageSchedulingMapper;
+import com.dsh.course.model.*;
import com.dsh.course.model.dto.DiscountJsonDto;
import com.dsh.course.model.vo.CourseDetailRequest;
import com.dsh.course.model.vo.RegisterCourseVo;
@@ -33,6 +35,9 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import net.bytebuddy.asm.Advice;
+import org.aspectj.weaver.ast.Var;
+import io.swagger.models.auth.In;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
@@ -49,10 +54,9 @@
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.time.*;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
import java.util.stream.Collectors;
@Api
@@ -112,9 +116,307 @@
@Autowired
private RestTemplate internalRestTemplate;
+ @Autowired
+ private CouponClient couponClient;
+ @Autowired
+ private StoreClient storeClient;
+ @Autowired
+ private TCoursePackageDiscountService discountService;
+ @Resource
+ private CoursePackageSchedulingMapper coursePackageSchedulingMapper;
+ @Autowired
+ private ICoursePackageSchedulingService coursePackageSchedulingService;
+ @Autowired
+ private CoursePackageStudentService coursePackageStudentService;
private final SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");
+ /**
+ * 添加购课记录-后台
+ * @return
+ */
+ @RequestMapping("/base/coursePackagePayment/add")
+ public Object addCoursePackagePayment(@RequestBody TCoursePackagePayment packagePayment){
+ packagePayment.setInsertTime(new Date());
+ packagePayment.setInsertTime(new Date());
+ Integer studentId = packagePayment.getStudentId();
+ // 添加学员上课记录
+ CoursePackageStudent coursePackageStudent = new CoursePackageStudent();
+ TCoursePackagePayment one = packagePaymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("studentId", packagePayment.getStudentId())
+ .orderByDesc("insertTime")
+ .last("LIMIT 1"));
+
+ if (one!=null){
+ Integer totalClassHours = one.getTotalClassHours();
+ Integer absencesNumber = one.getAbsencesNumber();
+ // 没有过期
+ if (one.getUseTime().after(new Date())){
+ if (one.getLaveClassHours()-packagePayment.getClassHours()<0){
+ return 5002;
+ }
+ packagePayment.setTotalClassHours(one.getTotalClassHours());
+ packagePayment.setLaveClassHours(one.getLaveClassHours()-packagePayment.getClassHours());
+ packagePayment.setAbsencesNumber(one.getAbsencesNumber());
+ }
+ packagePayment.setTotalClassHours(packagePayment.getClassHours());
+ packagePayment.setLaveClassHours(packagePayment.getClassHours());
+ packagePayment.setAbsencesNumber(one.getAbsencesNumber());
+ }else{
+ packagePayment.setTotalClassHours(packagePayment.getClassHours());
+ packagePayment.setLaveClassHours(packagePayment.getClassHours());
+ packagePayment.setAbsencesNumber(0);
+ }
+ // 生成排课数据
+ TCoursePackage coursePackage = tcpService.getById(packagePayment.getCoursePackageId());
+ //生成排课数据
+ try {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date = sdf1.parse(sdf.format(new Date()) + " 00:00:00");
+ List<String> list = Arrays.asList(coursePackage.getClassWeeks().split(";"));
+ String value = coursePackage.getClassStartTime();
+ String value1 = coursePackage.getClassEndTime();
+
+ String[] star = value.split(",");
+ String[] end = value1.split(",");
+ for (int i = 0; i < star.length; i++) {
+ // int index = star[i].indexOf(",");
+ // String result = value.substring(0, index).trim();
+ String classStartTime = star[i];
+ String[] split = classStartTime.split(":");
+ // String value1 = en;
+ int index1 = value1.indexOf(",");
+ // String result1 = value.substring(0, index1).trim();
+ String classEndTime = end[i];
+ String[] split1 = classEndTime.split(":");
+ Calendar s = Calendar.getInstance();
+ s.setTime(date);
+ s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 1);
+ s.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
+ s.set(Calendar.MINUTE, Integer.valueOf(split[1]));
+ s.set(Calendar.SECOND, 0);
+
+ Calendar e = Calendar.getInstance();
+ e.setTime(date);
+ e.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 14);
+ long timeInMillis = e.getTimeInMillis();
+
+ while (true){
+ int w = s.get(Calendar.DAY_OF_WEEK);
+ WeekEnum weekEnum = WeekEnum.getWeekEnum(w);
+ if(list.contains(weekEnum.getChineseName())){
+ Calendar classDate = Calendar.getInstance();
+ classDate.setTime(s.getTime());
+ classDate.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
+ classDate.set(Calendar.MINUTE, Integer.valueOf(split[1]));
+ classDate.set(Calendar.SECOND, 0);
+
+ Calendar endDate = Calendar.getInstance();
+ endDate.setTime(s.getTime());
+ endDate.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split1[0]));
+ endDate.set(Calendar.MINUTE, Integer.valueOf(split1[1]));
+ endDate.set(Calendar.SECOND, 0);
+
+ CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
+ coursePackageScheduling.setCoursePackageId(coursePackage.getId());
+ coursePackageScheduling.setClassDate(classDate.getTime());
+ coursePackageScheduling.setEndDate(endDate.getTime());
+ coursePackageScheduling.setStatus(1);
+ coursePackageSchedulingService.save(coursePackageScheduling);
+ coursePackageStudent.setCoursePackageSchedulingId(coursePackageScheduling.getId());
+
+ List<CoursePackageScheduling> list1 = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>()
+ .eq("coursePackageId", coursePackage.getId())
+ .eq("classDate", classDate.getTime())
+ .eq("endDate", endDate.getTime()));
+ if (list1.size()+1>coursePackage.getMaxSubscribeNumber()){
+ // 当前课包预约人数已满
+ return 5001;
+ }
+ }
+ s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 1);
+ if(s.getTimeInMillis() > timeInMillis){
+ break;
+ }
+ }
+ }
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+
+ coursePackageStudent.setStudentId(packagePayment.getStudentId());
+ coursePackageStudent.setCoursePackageId(packagePayment.getCoursePackageId());
+
+
+ coursePackageStudent.setSignInOrNot(0);
+ coursePackageStudent.setReservationStatus(1);
+ coursePackageStudent.setInsertTime(new Date());
+ coursePackageStudent.setAppUserId(packagePayment.getAppUserId());
+ packagePaymentService.save(packagePayment);
+ coursePackageStudent.setCoursePackagePaymentId(packagePayment.getId());
+ return coursePackageStudentService.save(coursePackageStudent);
+ }
+ /**
+ * 手动支付
+ * @return
+ */
+ @RequestMapping("/base/coursePackagePayment/changeState")
+ public Object changeState(@RequestBody CoursePackagePayDTO dto){
+
+ return packagePaymentService.changeState(dto);
+ }
+ @GetMapping("/coursePackagePayment/courseStore/{appUserId}/{coursePackageId}")
+ public List<TCoursePackagePayment> getByUserIdAndCoursePackageId(@PathVariable("appUserId") Integer appUserId,@PathVariable("coursePackageId") Integer coursePackageId){
+ List<TCoursePackagePayment> list = packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>()
+ .eq("appUserId", appUserId)
+ .eq("coursePackageId", coursePackageId));
+ return list;
+ }
+ /**
+ * 获取购课记录
+ */
+ @ResponseBody
+ @RequestMapping("/coursePackagePayment/listAll")
+ public List<CoursePackagePaymentVO> listAll(@RequestBody CoursePackagePaymentQuery query){
+ List<CoursePackagePaymentVO> res = packagePaymentService.listAll(query);
+ List<CoursePackagePaymentVO> result = new ArrayList<>();
+ for (CoursePackagePaymentVO re : res) {
+ if (re.getCashPayment()==null){
+ if (re.getPlayPaiCoin()!=null){
+ String value = String.valueOf(re.getPlayPaiCoin());
+ re.setCashPayment(new BigDecimal(value));
+ }
+ }
+
+ Store store = storeClient.queryStoreById(re.getStoreId());
+ TAppUser appUser = appUserClient.queryAppUser1(re.getAppUserId());
+ Student student = studentClient.queryStudentById(re.getStudentId());
+ re.setPayStudent(student.getName());
+ re.setPayUser(appUser.getName());
+ re.setPhone(appUser.getPhone());
+ re.setStoreName(store.getName());
+ if (query.getPayUser()== null || query.getPayUser().equals("") ){
+ }else{
+ List<AppUser> appUsers = appUserClient.queryAppUserListByName(query.getPayUser());
+ for (AppUser user : appUsers) {
+ if (appUser.getName().equals(user.getName())){
+ if (query.getPayStudent()== null || query.getPayStudent().equals("")){
+ }else{
+ List<Student> students = studentClient.queryStudentListByName(query.getPayStudent());
+ for (Student student1 : students) {
+ if (student.getName().equals(student1.getName())){
+ result.add(re);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ if (re.getPayType()!=null){
+ if (re.getPayType()==1){
+ re.setBuyTypeName("微信支付");
+ }else if(re.getPayType()==2){
+ re.setBuyTypeName("支付宝支付");
+ }else if(re.getPayType()==3){
+ re.setBuyTypeName("玩湃币支付");
+ }else if(re.getPayType()==4){
+ re.setBuyTypeName("积分支付");
+ }else if(re.getPayType()==5){
+ re.setBuyTypeName("积分+微信支付");
+ }else if(re.getPayType()==6){
+ re.setBuyTypeName("积分+支付宝支付");
+ }else if(re.getPayType()==7){
+ re.setBuyTypeName("手动支付"+"-"+re.getBuyTypeName());
+ }
+ }
+ BigDecimal subtract = re.getOriginalPrice().subtract(re.getCashPayment());
+ re.setDiscountAmount(subtract);
+ // 如果支付用户类型为管理员 则购买方式则为1线下购买
+ if (re.getPayUserType()!=null){
+ if (re.getPayUserType()== 2){
+ re.setBuyType(1);
+ }else{
+ // 如果当前课包有折扣 则为3折扣购买
+ if (discountService.list(new QueryWrapper<TCoursePackageDiscount>()
+ .eq("coursePackageId",re.getCoursePackageId()).eq("auditStatus",2)).size()>0){
+ re.setBuyType(3);
+ re.setDiscountAmount(re.getOriginalPrice().subtract(re.getPayMoney()));
+ }else{
+ re.setBuyType(2);
+ }
+ }
+ }
+ }
+ if (query.getPayStudent()== null || query.getPayStudent().equals("")){
+ if (query.getPayUser()== null || query.getPayUser().equals("")){
+ return res;
+ }else{
+ return result;
+ }
+ }else{
+ return result;
+ }
+ }
+
+ /**
+ * 获取报名订单记录列表
+ */
+ @ResponseBody
+ @RequestMapping("/registerOrder/listAllRegister")
+ public List<RegisterOrderVO> listAllRegister(@RequestBody RegisterOrderQuery query){
+ if (query.getStudentName()!=null){
+ if (!query.getStudentName().equals("")){
+ List<TStudent> students1 = studentClient.queryTStudentListByName(query.getStudentName());
+ List<Integer> studentIds = students1.stream().map(TStudent::getId).collect(Collectors.toList());
+ query.setStudentIds(studentIds);
+ if (students1.size()==0){
+ return new ArrayList<>();
+ }
+ }
+ }
+ List<RegisterOrderVO> res = packagePaymentService.listAllRegister(query);
+ // 该运营商下没有门店
+ if (query.getInsertType() == 2){
+ if (query.getStoresIds()!=null){
+ if (query.getStoresIds().size()==0){
+ List<RegisterOrderVO> registerOrderVOS = new ArrayList<>();
+ return registerOrderVOS;
+ }
+ }else{
+ List<RegisterOrderVO> registerOrderVOS = new ArrayList<>();
+ return registerOrderVOS;
+ }
+ }
+
+ List<RegisterOrderVO> result = new ArrayList<>();
+ Iterator<RegisterOrderVO> iterator = res.iterator();
+ while (iterator.hasNext()) {
+ RegisterOrderVO re = iterator.next();
+ if (re.getSalesName() == null) {
+ re.setSalesName("无");
+ }
+ if (re.getPayType() != null) {
+ if (re.getPayType() == 3) {
+ re.setPayMoneyAndType(re.getPlayPaiCoin() + "玩湃币");
+ } else {
+ re.setPayMoneyAndType("￥" + re.getMoney());
+ }
+ }
+ if (re.getStoreId()!=null){
+ Store store = storeClient.queryStoreById(re.getStoreId());
+ if (store!=null){
+ re.setStoreName(store.getName());
+ }
+ }
+ TAppUser appUser = appUserClient.queryAppUser1(re.getAppUserId());
+ Student student = studentClient.queryStudentById(re.getStudentId());
+ re.setPayStudent(student.getName());
+ re.setPayUser(appUser.getName());
+ re.setPhone(appUser.getPhone());
+ }
+ return res;
+ }
/**
* 获取 没有学员信息的图片配置
@@ -133,14 +435,20 @@
if (byUserId.size() > 0 ){
for (TCoursePackagePayment tCoursePackagePayment : byUserId) {
TCoursePackage tCoursePackage = tcpService.getById(tCoursePackagePayment.getCoursePackageId());
+ if (tCoursePackage.getType()==3){
+ continue;
+ }
StuCourseResp resp = new StuCourseResp();
resp.setCourseId(tCoursePackage.getId());
+ resp.setId(tCoursePackagePayment.getId());
resp.setCourseName(tCoursePackage.getName());
resp.setTotalCourseNums(tCoursePackagePayment.getTotalClassHours());
resp.setResidueNums(tCoursePackagePayment.getLaveClassHours());
resp.setDeductionNums(tCoursePackagePayment.getTotalClassHours()-tCoursePackagePayment.getLaveClassHours());
+ if (tCoursePackage.getValidDays()!=null){
String afterDayDate = DateUtil.getAfterDayDate2(tCoursePackage.getInsertTime(),tCoursePackage.getValidDays() + "");
resp.setPeriodOfValidity(afterDayDate);
+ }
resps.add(resp);
}
}
@@ -167,12 +475,12 @@
.groupBy("coursePackageId"));
if (list.size() > 0){
for (TCoursePackagePayment tCoursePackagePayment : list) {
- CoursePackageStudent packageStudent = cspsService.getOne(new LambdaQueryWrapper<CoursePackageStudent>()
+ List<CoursePackageStudent> packageStudent = cspsService.list(new LambdaQueryWrapper<CoursePackageStudent>()
.eq(CoursePackageStudent::getAppUserId, courseRest.getAppUserId())
.eq(CoursePackageStudent::getStudentId,courseRest.getStuId())
.eq(CoursePackageStudent::getCoursePackagePaymentId,tCoursePackagePayment.getId())
.eq(CoursePackageStudent::getCoursePackageId,tCoursePackagePayment.getCoursePackageId()));
- if (ToolUtil.isEmpty(packageStudent) || (ToolUtil.isNotEmpty(packageStudent) && packageStudent.getReservationStatus() != 1)){
+ if (ToolUtil.isEmpty(packageStudent) || (ToolUtil.isNotEmpty(packageStudent) && packageStudent.get(0).getReservationStatus() == 1)){
// 没有预约过的/已经取消了的
TCoursePackage tCoursePackage = tcpService.getById(tCoursePackagePayment.getCoursePackageId());
CoursePackagePaymentConfig paymentConfig = icppcService.getOne(new QueryWrapper<CoursePackagePaymentConfig>()
@@ -445,7 +753,6 @@
}
}
-
/**
* 课后视频课表
*/
@@ -455,27 +762,53 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
- public ResultUtil<List<AppUserVideoResponse>> queryAfterSourceList( CourseOfAfterRequest search){
- try {
+ public ResultUtil<List<AppUserVideoResponse>> queryAfterSourceList( CourseOfAfterRequest search) throws Exception {
+// try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
return ResultUtil.tokenErr();
}
- List<Integer> courseIds = new ArrayList<>();
- QueryWrapper<TCoursePackagePayment> queryWrapper = new QueryWrapper<TCoursePackagePayment>().eq("appUserId", appUserId)
- .groupBy("coursePackageId");
+//
+// List<Integer> courseIds = new ArrayList<>();
+// QueryWrapper<TCoursePackagePayment> queryWrapper = new QueryWrapper<TCoursePackagePayment>().eq("appUserId", appUserId)
+// .groupBy("coursePackageId");
+// if (ToolUtil.isNotEmpty(search.getCourseTypeId())){
+// queryWrapper.eq("coursePackageId",search.getCourseTypeId());
+// }
+// List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.list(queryWrapper);
+// if (tCoursePackagePayments.size() > 0 ){
+// courseIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
+// }
+
+
+ QueryWrapper<CoursePackageStudent> queryWrapper1 = new QueryWrapper<CoursePackageStudent>().eq("appUserId", appUserId);
if (ToolUtil.isNotEmpty(search.getCourseTypeId())){
- queryWrapper.eq("coursePackageId",search.getCourseTypeId());
+ queryWrapper1.eq("coursePackageId",search.getCourseTypeId());
}
- List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.list(queryWrapper);
- if (tCoursePackagePayments.size() > 0 ){
- courseIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
+
+ List<CoursePackageStudent> list = coursePackageStudentService.list(queryWrapper1);
+ List<Long> longs = new ArrayList<>();
+ for (CoursePackageStudent coursePackageStudent : list) {
+ longs.add(coursePackageStudent.getCoursePackageSchedulingId());
}
- return ResultUtil.success(packagePaymentService.queryAfterVideo(search,courseIds));
- }catch (Exception e){
- return ResultUtil.runErr();
- }
+
+ System.out.println("======longs========"+longs);
+ List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>().in("id",longs).isNotNull("courseId"));
+ List<AppUserVideoResponse> coursePackageSchedulings1 = coursePackageSchedulingService.queryAll(longs);
+
+
+
+
+ return ResultUtil.success(coursePackageSchedulings1);
+
+
+
+
+
+// }catch (Exception e){
+// return ResultUtil.runErr();
+// }
}
/**
@@ -499,7 +832,6 @@
}
}
-
@ResponseBody
@PostMapping("/api/startCource/payCourseInfo")
@ApiOperation(value = "课后练习-购课详情（用于购课）", tags = {"APP-开始上课"})
@@ -513,7 +845,6 @@
return ResultUtil.runErr();
}
}
-
@ResponseBody
@PostMapping("/api/startCource/getMyCourseList")
@@ -540,7 +871,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
- public ResultUtil<?> payCourse(@RequestBody PayCourseReq req){
+ public ResultUtil<?> payCourse(PayCourseReq req){
try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
@@ -551,7 +882,6 @@
return ResultUtil.runErr();
}
}
-
/**
* 更新课后视频学习状态
@@ -573,7 +903,6 @@
return ResultUtil.runErr();
}
}
-
@ResponseBody
@@ -617,7 +946,6 @@
}catch (Exception e){
return ResultUtil.runErr();
}
-
}
@@ -659,6 +987,10 @@
if(null == userIdFormRedis){
return ResultUtil.tokenErr();
}
+ Integer couponId = request.getConponId();
+ if(couponId==null || couponId==0){
+ request.setConponId(null);
+ }
return packagePaymentService.ContinuationOrpaymentCourse(userIdFormRedis,request);
}catch (Exception e){
return ResultUtil.runErr();
@@ -673,6 +1005,7 @@
*/
@PostMapping("/base/coursePackage/alipayRegisteredCoursesCallback")
public void alipayCallback(HttpServletRequest request, HttpServletResponse response){
+ System.err.println("========支付宝支付回调========");
try {
Map<String, String> map = payMoneyUtil.alipayCallback(request);
if(null != map){
@@ -758,6 +1091,24 @@
}
+ public static Date[] generateDateArray(int numDays,Date date) {
+// LocalDate tomorrow = LocalDate.now().plusDays(1);
+ LocalDate tomorrow = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().plusDays(1);
+
+ Date[] dates = new Date[numDays];
+
+ for (int i = 0; i < numDays; i++) {
+ LocalDate currentDate = tomorrow.plusDays(i);
+ dates[i] = Date.from(currentDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
+ }
+
+ return dates;
+ }
+
+ @Autowired
+ private TCoursePackageService packageService;
+ @Autowired
+ CoursePackageStudentService studentService ;
/**
* 课程用于支付进行扣减
* @param paymentDeductionClassHour
@@ -767,62 +1118,287 @@
public void paymentDeductionClassHour(@RequestBody PaymentDeductionClassHour paymentDeductionClassHour){
try {
// 2.0 用id进行查询
- List<TCoursePackagePayment> list = packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>().eq("id", paymentDeductionClassHour.getCourseId()).eq("payStatus", 2)
+ TCoursePackagePayment coursePackagePayment= packagePaymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("id", paymentDeductionClassHour.getCourseId()).eq("payStatus", 2)
.eq("status", 1).eq("state", 1).gt("laveClassHours", 0));
Integer classHour = paymentDeductionClassHour.getClassHour();
- for (TCoursePackagePayment coursePackagePayment : list) {
- if(coursePackagePayment.getLaveClassHours().compareTo(classHour) >= 0){
+// for (TCoursePackagePayment coursePackagePayment : list) {
+ if (coursePackagePayment.getLaveClassHours().compareTo(classHour) >= 0) {
coursePackagePayment.setLaveClassHours(coursePackagePayment.getLaveClassHours() - classHour);
+ coursePackagePayment.setAppUserId(null);
packagePaymentService.updateById(coursePackagePayment);
- // 2.0 少于3课时 推送
- if(coursePackagePayment.getLaveClassHours()<=3){
- Integer appUserId = coursePackagePayment.getAppUserId();
- //调用推送
- HttpHeaders headers = new HttpHeaders();
- // 以表单的方式提交
- headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
- String s1 = appUserId + "_" + "Three";
- //定时修改排课状态
- String s = internalRestTemplate.getForObject("http://mb-cloud-gateway/netty/sendMsgToClient?id="+s1, String.class);
- JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
- if(jsonObject1.getIntValue("code") != 200){
- System.err.println(jsonObject1.getString("msg"));
+// coursePackageSchedulingService.remove(new QueryWrapper<CoursePackageScheduling>().eq("courseId", coursePackagePayment.getCoursePackageId()));
+
+
+ List<CoursePackageStudent> studentCourse = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", coursePackagePayment.getStudentId()).eq("coursePackageId", coursePackagePayment.getCoursePackageId()));
+ List<Long> collect = studentCourse.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());
+ coursePackageSchedulingService.remove(new QueryWrapper<CoursePackageScheduling>().in("id",collect));
+ coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().eq("studentId", paymentDeductionClassHour.getId()).eq("coursePackageId", coursePackagePayment.getCoursePackageId()));
+
+
+
+
+ Student student = studentClient.queryStudentById(coursePackagePayment.getStudentId());
+
+ TCoursePackage tCoursePackage = packageService.getById(coursePackagePayment.getCoursePackageId());
+ String classWeeks = tCoursePackage.getClassWeeks();
+ List<Integer> week = week(classWeeks);
+
+ List<TCoursePackagePayment> pays = packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>().eq("coursePackageId", coursePackagePayment.getCoursePackageId()).eq("studentId", coursePackagePayment.getStudentId()));
+
+
+ for (TCoursePackagePayment pay : pays) {
+
+
+ List<CoursePackageStudent> studentCourse1 = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", pay.getStudentId()).eq("coursePackageId", pay.getCoursePackageId()));
+ List<Long> collect1 = studentCourse1.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());
+ //拿到最后一天的排课记录
+
+ CoursePackageScheduling cs = null;
+ if (collect1.size()>0) {
+ cs = coursePackageSchedulingService.getOne(new QueryWrapper<CoursePackageScheduling>().in("id", collect1).orderByDesc("classDate").last("limit 1"));
+
+ }
+//
+// Calendar calendar = Calendar.getInstance();
+// Date currentDate = calendar.getTime();
+// calendar.add(Calendar.DAY_OF_MONTH, -1);
+// Date today = calendar.getTime();
+ Date today = new Date();
+
+ //判断最后一天是否超过当前日期
+ if (cs==null||cs.getClassDate().before(new Date())){
+ }else {
+ today = cs.getClassDate();
+ }
+
+ Integer laveClassHours = pay.getLaveClassHours();
+ Integer codeTime = tCoursePackage.getCodeTime();
+ Integer can = laveClassHours/codeTime;
+
+ int count = 0;
+
+
+ String[] split = tCoursePackage.getClassStartTime().split(",");
+ String[] split1 = tCoursePackage.getClassEndTime().split(",");
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+ Date[] dates = generateDateArray(14,today);
+ for (Date date : dates) {
+ if (count==can){
+ break;
+ }
+ int wei = cn.hutool.core.date.DateUtil.dayOfWeek(date);
+ if (week.contains(wei)){
+ for (int i1 = 0; i1 < split.length; i1++) {
+ if (count==can){
+ break;
+ }
+ CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
+ coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+ Date parse = format1.parse(format.format(date) + " " + split[i1]);
+ Date parse1 = format1.parse(format.format(date) + " " + split1[i1]);
+ coursePackageScheduling.setClassDate(parse);
+ coursePackageScheduling.setEndDate(parse1);
+ coursePackageScheduling.setStatus(1);
+ coursePackageSchedulingService.save(coursePackageScheduling);
+ CoursePackageStudent student1 = new CoursePackageStudent();
+ student1.setAppUserId(pay.getAppUserId());
+ student1.setStudentId(pay.getStudentId());
+ student1.setCoursePackageId(pay.getCoursePackageId());
+ student1.setCoursePackagePaymentId(pay.getId());
+ student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());
+ student1.setSignInOrNot(1);
+ student1.setReservationStatus(1);
+ student1.setInsertTime(new Date());
+ studentService.save(student1);
+ count++;
+ }
}
}
- CancelledClasses cancelledClasses = new CancelledClasses();
- cancelledClasses.setType(2);
- cancelledClasses.setVoucher(paymentDeductionClassHour.getCode());
- cancelledClasses.setCoursePackageId(coursePackagePayment.getCoursePackageId());
- cancelledClasses.setCoursePackagePaymentId(coursePackagePayment.getId());
- cancelledClasses.setCancelledClassesNumber(classHour);
- cancelledClasses.setInsertTime(new Date());
- cancelledClassesService.save(cancelledClasses);
- break;
- }else{
- CancelledClasses cancelledClasses = new CancelledClasses();
- cancelledClasses.setType(2);
- cancelledClasses.setVoucher(paymentDeductionClassHour.getCode());
- cancelledClasses.setCoursePackageId(coursePackagePayment.getCoursePackageId());
- cancelledClasses.setCoursePackagePaymentId(coursePackagePayment.getId());
- cancelledClasses.setCancelledClassesNumber(coursePackagePayment.getLaveClassHours());
- cancelledClasses.setInsertTime(new Date());
- cancelledClassesService.save(cancelledClasses);
+ }
- coursePackagePayment.setLaveClassHours(0);
- packagePaymentService.updateById(coursePackagePayment);
- classHour -= cancelledClasses.getCancelledClassesNumber();
- }
- }
+
+
+
+// // 本周周几
+// int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date()) - 1;
+// for (Integer integer : week) {
+// if (integer < i) {
+// // 找下一周的时间
+// Calendar instance = Calendar.getInstance();
+// instance.add(Calendar.DATE, 7 - (i - integer));
+// Date time = instance.getTime();
+//
+// for (int i1 = 0; i1 < split.length; i1++) {
+//
+// CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
+// coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+// Date parse = format1.parse(format.format(time) + " " + split[i1]);
+// Date parse1 = format1.parse(format.format(time) + " " + split1[i1]);
+// coursePackageScheduling.setClassDate(parse);
+// coursePackageScheduling.setEndDate(parse1);
+// coursePackageScheduling.setStatus(1);
+// coursePackageSchedulingService.save(coursePackageScheduling);
+// CoursePackageStudent student1 = new CoursePackageStudent();
+// student1.setAppUserId(student.getAppUserId());
+// student1.setStudentId(student.getId());
+// student1.setCoursePackageId(tCoursePackage.getId());
+// student1.setCoursePackagePaymentId(coursePackagePayment.getId());
+// student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());
+// student1.setSignInOrNot(1);
+// student1.setReservationStatus(1);
+// student1.setInsertTime(new Date());
+// studentService.save(student1);
+//
+// }
+//
+// } else if (integer > i) {
+// Calendar instance = Calendar.getInstance();
+// instance.add(Calendar.DATE, integer - i);
+// Date time1 = instance.getTime();
+// List<Date> list6 = new ArrayList<>();
+// list6.add(time1);
+// instance.add(Calendar.DATE, 7);
+// Date time2 = instance.getTime();
+// list6.add(time2);
+// for (Date time : list6) {
+// for (int i1 = 0; i1 < split.length; i1++) {
+// CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
+// coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+// Date parse = format1.parse(format.format(time) + " " + split[i1]);
+// Date parse1 = format1.parse(format.format(time) + " " + split1[i1]);
+// coursePackageScheduling.setClassDate(parse);
+// coursePackageScheduling.setEndDate(parse1);
+// coursePackageScheduling.setStatus(1);
+// coursePackageSchedulingService.save(coursePackageScheduling);
+//
+// CoursePackageStudent student1 = new CoursePackageStudent();
+// student1.setAppUserId(student.getAppUserId());
+// student1.setStudentId(student.getId());
+// student1.setCoursePackageId(tCoursePackage.getId());
+// student1.setCoursePackagePaymentId(coursePackagePayment.getId());
+// student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());
+// student1.setSignInOrNot(1);
+// student1.setReservationStatus(1);
+// student1.setInsertTime(new Date());
+// studentService.save(student1);
+// }
+// }
+//
+// } else {
+// Calendar instance = Calendar.getInstance();
+// instance.add(Calendar.DATE, 7);
+// Date time = instance.getTime();
+//
+// for (int i1 = 0; i1 < split.length; i1++) {
+// CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
+// coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+// Date parse = format1.parse(format.format(time) + " " + split[i1]);
+// Date parse1 = format1.parse(format.format(time) + " " + split1[i1]);
+// coursePackageScheduling.setClassDate(parse);
+// coursePackageScheduling.setEndDate(parse1);
+// coursePackageScheduling.setStatus(1);
+// coursePackageSchedulingService.save(coursePackageScheduling);
+//
+// CoursePackageStudent student1 = new CoursePackageStudent();
+// student1.setAppUserId(student.getAppUserId());
+// student1.setStudentId(student.getId());
+// student1.setCoursePackageId(tCoursePackage.getId());
+// student1.setCoursePackagePaymentId(coursePackagePayment.getId());
+// student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());
+// student1.setSignInOrNot(1);
+// student1.setReservationStatus(1);
+// student1.setInsertTime(new Date());
+// studentService.save(student1);
+// }
+// }
+// }
+
+
+ // 2.0 少于3课时 推送
+ if (coursePackagePayment.getLaveClassHours() <= 3) {
+ Integer appUserId = coursePackagePayment.getAppUserId();
+
+ //调用推送
+ HttpHeaders headers = new HttpHeaders();
+ // 以表单的方式提交
+ headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ String s1 = appUserId + "_" + "Three";
+ //定时修改排课状态
+ String s = internalRestTemplate.getForObject("http://mb-cloud-gateway/netty/sendMsgToClient?id=" + s1, String.class);
+ JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
+ if (jsonObject1.getIntValue("code") != 200) {
+ System.err.println(jsonObject1.getString("msg"));
+ }
+ }
+
+ CancelledClasses cancelledClasses = new CancelledClasses();
+ cancelledClasses.setType(2);
+ cancelledClasses.setVoucher(paymentDeductionClassHour.getCode());
+ cancelledClasses.setCoursePackageId(coursePackagePayment.getCoursePackageId());
+ cancelledClasses.setCoursePackagePaymentId(coursePackagePayment.getId());
+ cancelledClasses.setCancelledClassesNumber(classHour);
+ cancelledClasses.setInsertTime(new Date());
+ cancelledClassesService.save(cancelledClasses);
+
+ }else{
+ CancelledClasses cancelledClasses = new CancelledClasses();
+ cancelledClasses.setType(2);
+ cancelledClasses.setVoucher(paymentDeductionClassHour.getCode());
+ cancelledClasses.setCoursePackageId(coursePackagePayment.getCoursePackageId());
+ cancelledClasses.setCoursePackagePaymentId(coursePackagePayment.getId());
+ cancelledClasses.setCancelledClassesNumber(coursePackagePayment.getLaveClassHours());
+ cancelledClasses.setInsertTime(new Date());
+ cancelledClassesService.save(cancelledClasses);
+
+ coursePackagePayment.setLaveClassHours(0);
+ packagePaymentService.updateById(coursePackagePayment);
+
+ classHour -= cancelledClasses.getCancelledClassesNumber();
+ }
+// }
+
+
}catch (Exception e){
e.printStackTrace();
}
}
-
+ private List<Integer> week(String week){
+ String[] split = week.split(";");
+ ArrayList<Integer> integers = new ArrayList<>();
+ for (String s : split) {
+ switch (s){
+ case "周一":
+ integers.add(1);
+ break;
+ case "周二":
+ integers.add(2);
+ break;
+ case "周三":
+ integers.add(3);
+ break;
+ case "周四":
+ integers.add(4);
+ break;
+ case "周五":
+ integers.add(5);
+ break;
+ case "周六":
+ integers.add(6);
+ break;
+ case "周日":
+ integers.add(7);
+ break;
+ }
+ }
+ return integers;
+ }
/**
* 取消赛事回退支付课时
* @param paymentDeductionClassHour
@@ -931,6 +1507,15 @@
.eq("code",code));
}
+
+ @PostMapping("/base/coursePack/getCoursePackagePaymentById")
+ public TCoursePackagePayment getCoursePackagePaymentById(@RequestBody Long id){
+ TCoursePackagePayment byId = packagePaymentService.getById(id);
+ System.out.println("======byId=========="+byId);
+ return byId;
+ }
+
+
@PostMapping("/base/coursePack/delPaymentCoursePackage")
public boolean delPaymentCoursePackage(@RequestBody Integer payId){
return packagePaymentService.removeById(payId);
@@ -955,19 +1540,19 @@
@PostMapping("/base/coursePack/savePaymentCoursePackage")
public boolean savePaymentCoursePackage(@RequestBody TCoursePackagePayment packagePayment){
- packagePayment.setInsertTime(new Date());
+
return packagePaymentService.save(packagePayment);
}
-
+ @ResponseBody
@PostMapping("/base/coursePack/obtainStudentClassDetails")
public List<RecordAppoint> obtainStudentClassDetailsData(@RequestBody WeeksOfCourseRest stuId){
- try {
- return packagePaymentService.obtainStuClassDetails(stuId.getStuId(),stuId.getAppUserId());
- }catch (Exception e){
- e.printStackTrace();
- throw new RuntimeException();
- }
+// try {
+ return packagePaymentService.obtainStuClassDetails(stuId.getStuId(),stuId.getAppUserId(),stuId.getPageNum());
+// }catch (Exception e){
+// e.printStackTrace();
+// throw new RuntimeException();
+// }
}
@@ -988,11 +1573,17 @@
// 2.0 送课时
@PostMapping("/base/coursePack/sendHours")
- public Boolean sendHours(@RequestBody String s){
+ public Integer sendHours(@RequestBody String s){
String[] split = s.split("_");
- TCoursePackagePayment byId = packagePaymentService.getById(Integer.valueOf(split[0]));
+ TCoursePackagePayment byId = packagePaymentService.getById(Long.valueOf(split[0]));
byId.setTotalClassHours(byId.getTotalClassHours()+Integer.valueOf(split[2]));
- return packagePaymentService.updateById(byId);
+ boolean b = packagePaymentService.updateHoursById(byId,Integer.valueOf(split[2]));
+ if(b){
+ return 1;
+ }else {
+
+ return 0;
+ }
}
@@ -1042,8 +1633,18 @@
*/
@ResponseBody
@PostMapping("/coursePackagePayment/queryCoursePackagePaymentById")
- public TCoursePackagePayment queryCoursePackagePaymentById(@RequestBody Long id){
+ public TCoursePackagePayment queryCoursePackagePaymentById(@RequestParam("id")Long id){
return packagePaymentService.getById(id);
+ }
+
+
+ @ResponseBody
+ @PostMapping("/coursePackagePayment/CountqueryByClassId")
+ public Integer CountqueryByClassId(@RequestBody Integer id){
+ int coursePackageId = packagePaymentService.count(new QueryWrapper<TCoursePackagePayment>().eq("coursePackageId", id));
+
+
+ return coursePackageId;
}
@@ -1054,7 +1655,22 @@
@ResponseBody
@PostMapping("/coursePackagePayment/editCoursePackagePayment")
public void editCoursePackagePayment(TCoursePackagePayment coursePackagePayment){
+ coursePackagePayment.setAppUserId(null);
packagePaymentService.updateById(coursePackagePayment);
+ }
+
+
+
+ /**
+ * 修改数据
+ * @param coursePackagePayment
+ */
+ @ResponseBody
+ @PostMapping("/coursePackagePayment/editCoursePackagePayment1")
+ public void editCoursePackagePayment1(@RequestBody TCoursePackagePayment coursePackagePayment){
+ System.out.println("editCoursePackagePayment1====coursePackagePayment"+coursePackagePayment);
+// coursePackagePayment.setCoursePackageId(null);
+ packagePaymentService.updateBytime(coursePackagePayment);
}
@@ -1077,40 +1693,669 @@
if(null == appUserId){
return ResultUtil.tokenErr();
}
- TCoursePackagePayment packagePayment = packagePaymentService.getOne(new LambdaQueryWrapper<TCoursePackagePayment>()
+ List<TCoursePackagePayment> packagePayment = packagePaymentService.list(new LambdaQueryWrapper<TCoursePackagePayment>()
.eq(TCoursePackagePayment::getCoursePackageId,courseID )
.eq(TCoursePackagePayment::getAppUserId,appUserId)
.eq(TCoursePackagePayment::getStudentId,stuId)
);
- if (ToolUtil.isEmpty(packagePayment)){
+ if (ToolUtil.isEmpty(packagePayment) || packagePayment.size()==0){
return ResultUtil.error("该用户未购买该课包");
}
- CoursePackageStudent coursePackageStudent = cspsService.getOne(new LambdaQueryWrapper<CoursePackageStudent>()
- .eq(CoursePackageStudent::getCoursePackageId,packagePayment.getCoursePackageId())
- .eq(CoursePackageStudent::getCoursePackagePaymentId,courseID)
+ List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingMapper.selectList(new LambdaQueryWrapper<CoursePackageScheduling>()
+ .eq(CoursePackageScheduling::getCoursePackageId, Integer.valueOf(courseID))
+ .like(CoursePackageScheduling::getClassDate, time)
+ );
+
+ List<CoursePackageStudent> coursePackageStudent = cspsService.list(new LambdaQueryWrapper<CoursePackageStudent>()
+ .in(CoursePackageStudent::getCoursePackagePaymentId,packagePayment.stream().map(TCoursePackagePayment::getId).collect(Collectors.toList()))
+ .in(CoursePackageStudent::getCoursePackageSchedulingId,coursePackageSchedulings.stream().map(CoursePackageScheduling::getId).collect(Collectors.toList()))
+ .eq(CoursePackageStudent::getCoursePackageId,courseID)
.eq(CoursePackageStudent::getStudentId,stuId)
.eq(CoursePackageStudent::getAppUserId,appUserId)
);
- if (ToolUtil.isNotEmpty(coursePackageStudent) && coursePackageStudent.getReservationStatus() == 0){
- coursePackageStudent.setSignInOrNot(2);
- coursePackageStudent.setInsertTime(simpleDateFormat.parse(time));
- cspsService.updateById(coursePackageStudent);
+ if (ToolUtil.isNotEmpty(coursePackageStudent)){
+ for (CoursePackageStudent packageStudent : coursePackageStudent) {
+ if(packageStudent.getReservationStatus()==1){
+ packageStudent.setSignInOrNot(2);
+ cspsService.updateSignInOrNotById(packageStudent.getId());
+ }
+ }
+
}else {
- coursePackageStudent = new CoursePackageStudent();
- coursePackageStudent.setAppUserId(appUserId);
- coursePackageStudent.setStudentId(stuId);
- coursePackageStudent.setCoursePackageId(packagePayment.getCoursePackageId());
- coursePackageStudent.setCoursePackagePaymentId(Long.parseLong(courseID));
- coursePackageStudent.setSignInOrNot(2);
- coursePackageStudent.setInsertTime(simpleDateFormat.parse(time));
- cspsService.save(coursePackageStudent);
}
return ResultUtil.success();
}catch (Exception e){
+ e.printStackTrace();
return ResultUtil.runErr();
}
}
+ @ResponseBody
+ @PostMapping("/base/coursePack/weeksOfCourseDetailsList")
+ HashMap<String, Object> weeksOfCourseDetailsList(@RequestBody CourseDetailReq courseDetailReq){
+ HashMap<String, Object> map = new HashMap<>();
+ ArrayList<DetailsListVo> objects = new ArrayList<>();
+ try {
+ String time = courseDetailReq.getTime();
+ Date parse = new SimpleDateFormat("yyyy-MM-dd").parse(time);
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(parse)-1;
+ String week = week(i);
+ Store store = sreClient.queryStoreById(courseDetailReq.getStoreId());
+ String lat = store.getLat();
+ String lon = store.getLon();
+
+ Map<String, Double> distance = GeodesyUtil.getDistance(courseDetailReq.getLon() + "," + courseDetailReq.getLat(), lon + "," + lat);
+ double wgs84 = distance.get("WGS84") / 1000;
+ map.put("distance",wgs84);
+ map.put("name",store.getName());
+ map.put("lon",lon);
+ map.put("lat",lat);
+
+ String time1 = courseDetailReq.getTime();
+
+ // 找出门店的所有课程 排出体验
+ List<TCoursePackage> list = tcpService.list(new LambdaQueryWrapper<TCoursePackage>().eq(TCoursePackage::getStoreId, courseDetailReq.getStoreId()).ne(TCoursePackage::getType, 3).eq(TCoursePackage::getState,1).like(TCoursePackage::getClassWeeks,week));
+ List<Integer> collect = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add(-1);
+ }
+ // 找出购买的课包
+ List<TCoursePackagePayment> list1 = packagePaymentService.list(new LambdaQueryWrapper<TCoursePackagePayment>().eq(TCoursePackagePayment::getAppUserId, courseDetailReq.getAppUserId()).eq(TCoursePackagePayment::getStudentId, courseDetailReq.getStuId()).in(TCoursePackagePayment::getCoursePackageId, collect));
+ List<Integer> collect1 = list1.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
+ List<Long> ids = list1.stream().map(TCoursePackagePayment::getId).collect(Collectors.toList());
+ for (TCoursePackage tCoursePackage : list) {
+ DetailsListVo detailsListVo = new DetailsListVo();
+ detailsListVo.setId(tCoursePackage.getId());
+ detailsListVo.setName(tCoursePackage.getName());
+ String classStartTime = tCoursePackage.getClassStartTime();
+ String[] split = classStartTime.split(",");
+ String classEndTime = tCoursePackage.getClassEndTime();
+ String[] split1 = classEndTime.split(",");
+ ArrayList<String> strings = new ArrayList<>();
+ if(ToolUtil.isNotEmpty(classStartTime)){
+ for (int i1 = 0; i1 < split.length; i1++) {
+ String s = split[i1].substring(0,5) + "-" + split1[i1].substring(0,5);
+ strings.add(s);
+ }
+ }
+
+ detailsListVo.setTime(strings);
+ List<CoursePackagePaymentConfig> list2 = icppcService.list(new LambdaQueryWrapper<CoursePackagePaymentConfig>().eq(CoursePackagePaymentConfig::getCoursePackageId, tCoursePackage.getId()).orderByAsc(CoursePackagePaymentConfig::getCashPayment));
+ if (list2.size() > 0) {
+ Double cashPayment = list2.get(0).getCashPayment();
+ detailsListVo.setMoney(cashPayment);
+ }
+ detailsListVo.setNum(tCoursePackage.getNeedNum());
+ if (collect1.contains(tCoursePackage.getId())) {
+ // 找出排课记录
+ List<CoursePackageScheduling> list3 = coursePackageSchedulingMapper.selectList(new LambdaQueryWrapper<CoursePackageScheduling>()
+ .eq(CoursePackageScheduling::getCoursePackageId, tCoursePackage.getId())
+ .like(CoursePackageScheduling::getClassDate, courseDetailReq.getTime())
+ );
+ if(list3.size()==0){
+ break;
+ }
+ List<Long> collect2 = list3.stream().map(CoursePackageScheduling::getId).collect(Collectors.toList());
+ if(collect2.size()==0){
+ collect2.add(-1l);
+ }
+ List<CoursePackageStudent> list4 = cspsService.list(new LambdaQueryWrapper<CoursePackageStudent>()
+ .eq(CoursePackageStudent::getAppUserId, courseDetailReq.getAppUserId())
+ .eq(CoursePackageStudent::getCoursePackageId, tCoursePackage.getId())
+ .in(CoursePackageStudent::getCoursePackageSchedulingId, collect2).
+ in(CoursePackageStudent::getCoursePackagePaymentId, ids)
+ );
+
+ if(list4.size()>0){
+ Integer signInOrNot = list4.get(0).getSignInOrNot();
+ detailsListVo.setType(1);
+
+ if(signInOrNot==2){
+ detailsListVo.setType(3);
+ }
+ detailsListVo.setIsType(list4.get(0).getType());
+
+ }else {
+ detailsListVo.setType(2);
+
+ }
+
+ } else {
+ detailsListVo.setType(2);
+ }
+ objects.add(detailsListVo);
+ }
+ map.put("data",objects);
+
+ return map;
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return map;
+ }
+
+ private String week(int i){
+ String a = "";
+ switch (i){
+ case 1:
+ a="周一";
+ break;
+ case 2:
+ a="周二";
+ break;
+ case 3:
+ a="周三";
+ break;
+ case 4:
+ a="周四";
+ break;
+ case 5:
+ a="周五";
+ break;
+ case 6:
+ a="周六";
+ break;
+ case 7:
+ a="周日";
+ break;
+ }
+ return a;
+ }
+
+
+ @ResponseBody
+ @PostMapping("/coursePackagePayment/queryCourseData")
+ public List<Map<String,Object>> queryCourseData(@RequestBody List<Integer> ids){
+ // 找出课程类型 找出剩余的课时数
+ List<TCoursePackageType> list = coursePackageTypeService.list();
+ if(ids.size()==0){
+ ids.add(-1);
+ }
+ List<TCoursePackagePayment> list1 = packagePaymentService.listOne(ids);
+ List<Integer> collect = list1.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add(-1);
+ }
+ List<TCoursePackage> list2 = tcpService.list(new LambdaQueryWrapper<TCoursePackage>().in(TCoursePackage::getId, collect));
+ for (TCoursePackagePayment tCoursePackagePayment : list1) {
+ for (TCoursePackage tCoursePackage : list2) {
+ if(tCoursePackagePayment.getCoursePackageId().equals(tCoursePackage.getId())){
+ tCoursePackagePayment.setType(tCoursePackage.getType());
+ }
+ }
+ }
+
+
+ List<Map<String,Object>> mapList = new ArrayList<>();
+ for (TCoursePackageType tCoursePackageType : list) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("name",tCoursePackageType.getName());
+ int a =0;
+ for (TCoursePackagePayment tCoursePackagePayment : list1) {
+ if(tCoursePackagePayment.getType().equals(tCoursePackageType.getId())){
+ a += tCoursePackagePayment.getLaveClassHours();
+ }
+ }
+ map.put("value",a);
+ mapList.add(map);
+ }
+
+
+ return mapList;
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/coursePackagePayment/coursePt")
+ HashMap<String, Object> coursePt(@RequestBody List<Integer> userPt){
+ if(userPt.size()==0){
+ userPt.add(-1);
+ }
+ HashMap<String, Object> map = new HashMap<>();
+ List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.listOne(userPt);
+ int sum = tCoursePackagePayments.stream().mapToInt(TCoursePackagePayment::getTotalClassHours).sum();
+ int sum1 = tCoursePackagePayments.stream().mapToInt(TCoursePackagePayment::getLaveClassHours).sum();
+ map.put("allCourse",sum-sum1);
+
+ //所有课包
+ List<TCoursePackage> coursePackages = tcpService.list();
+
+
+ // 年
+ List<CoursePackageStudent> list = cspsService.list(new LambdaQueryWrapper<CoursePackageStudent>().in(CoursePackageStudent::getAppUserId, userPt));
+
+
+ for (CoursePackageStudent coursePackageStudent : list) {
+ for (TCoursePackage coursePackage : coursePackages) {
+ if(coursePackageStudent.getCoursePackageId().equals(coursePackage.getId())){
+ if(ToolUtil.isEmpty(coursePackage.getNeedNum())){
+ coursePackageStudent.setNeedNum(0);
+ }else {
+ coursePackageStudent.setNeedNum(coursePackage.getNeedNum());
+ }
+ }
+ }
+ }
+
+ ArrayList<Object> integers = new ArrayList<>();
+ int year = cn.hutool.core.date.DateUtil.year(new Date());
+ for (int i = 0; i < 10; i++) {
+ integers.add(year-i);
+ }
+ List<Object> collect = integers.stream().sorted().collect(Collectors.toList());
+ // 年
+ ArrayList<Integer> years = new ArrayList<>();
+ for (Object o : collect) {
+ String s = o.toString();
+ List<CoursePackageStudent> collect1 = list.stream().filter(e -> e.getInsertTime().toString().contains(s)).filter(student -> student.getNeedNum() != null).collect(Collectors.toList());
+ int sum2 = collect1.stream().mapToInt(CoursePackageStudent::getNeedNum).sum();
+ years.add(sum2);
+ }
+
+ map.put("yearData",years);
+
+
+
+ ArrayList<Integer> months = new ArrayList<>();
+
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+
+ // 月
+ for (int i = 1; i <= 12; i++) {
+ String m=i+"";
+ if(i<10){
+ m="0"+i;
+ }
+ String s = year + "-" + m;
+ List<CoursePackageStudent> collect1 = list.stream().filter(e -> format.format(e.getInsertTime()).contains(s)).filter(student -> student.getNeedNum() != null).collect(Collectors.toList());
+ int sum2 = collect1.stream().mapToInt(CoursePackageStudent::getNeedNum).sum();
+ months.add(sum2);
+ }
+ map.put("monthData",months);
+
+ // 周
+ // 获取最近四周
+ LocalDateTime minNow = LocalDateTime.now().with(LocalTime.MIN);
+ LocalDateTime maxNow = LocalDateTime.now().with(LocalTime.MAX);
+ // 周度数据
+ LocalDateTime s1 = minNow.minusDays(6);
+ LocalDateTime s2 = maxNow;
+
+ LocalDateTime s3 = minNow.minusDays(13);
+ LocalDateTime s4 = maxNow.minusDays(6);
+
+
+ LocalDateTime s5 = minNow.minusDays(20);
+ LocalDateTime s6 = maxNow.minusDays(13);
+
+ LocalDateTime s7 = minNow.minusDays(27);
+ LocalDateTime s8 = maxNow.minusDays(20);
+ ArrayList<Object> weekData = new ArrayList<>();
+
+ int count = 0;
+
+ int count1 = 0;
+
+ int count2 = 0;
+
+ int count3 = 0;
+ for (CoursePackageStudent coursePackageStudent : list) {
+ if (coursePackageStudent.getNeedNum()==null){
+ continue;
+ }
+ // 如果到课状态为否 则不计算
+ if (coursePackageStudent.getSignInOrNot() != 0) {
+ Date insertTime = coursePackageStudent.getInsertTime();
+ Instant instant = insertTime.toInstant();
+ ZoneId zoneId = ZoneId.systemDefault();
+ LocalDateTime dateTime = instant.atZone(zoneId).toLocalDateTime();
+ if (dateTime.isAfter(s1) && dateTime.isBefore(s2)){
+
+ count+=coursePackageStudent.getNeedNum();
+ }else if(dateTime.isAfter(s3) && dateTime.isBefore(s4)){
+ count1+=coursePackageStudent.getNeedNum();
+ }else if(dateTime.isAfter(s5) && dateTime.isBefore(s6)){
+ count2+=coursePackageStudent.getNeedNum();
+ }else if(dateTime.isAfter(s7) && dateTime.isBefore(s8)){
+ count3+=coursePackageStudent.getNeedNum();
+ }
+
+ }
+ }
+ weekData.add(count3);
+ weekData.add(count2);
+ weekData.add(count1);
+ weekData.add(count);
+
+ map.put("weekData",weekData);
+
+
+ LocalDateTime currentDateTime = LocalDateTime.now();
+ List<Integer> amountByDay = new ArrayList<>(Collections.nCopies(7,0));
+ for (CoursePackageStudent coursePackageStudent : list) {
+ Date insertTime = coursePackageStudent.getInsertTime();
+ // 将 Date 转换为 LocalDateTime
+ LocalDateTime insertDateTime = LocalDateTime.ofInstant(insertTime.toInstant(), ZoneId.systemDefault());
+ // 计算日期与当前日期的差距
+ long daysDifference = ChronoUnit.DAYS.between(insertDateTime.toLocalDate(), currentDateTime.toLocalDate());
+ // 如果日期在七天内，累加金额
+ if (daysDifference >= 0 && daysDifference < 7) {
+ int index = (int) (6 - daysDifference); // 计算对应的索引位置
+ Integer needNum = coursePackageStudent.getNeedNum();
+ if (needNum!=null){
+ int i = amountByDay.get(index) + needNum;
+ amountByDay.set(index, i);
+ }
+
+ }
+ }
+ map.put("dayData", amountByDay);
+
+ return map;
+
+ }
+ @ResponseBody
+ @PostMapping("/coursePackagePayment/courseYys")
+ HashMap<String, Object> courseYys(@RequestBody List<Integer> userPt){
+ if(userPt.size()==0){
+ userPt.add(-1);
+ }
+ HashMap<String, Object> map = new HashMap<>();
+ List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.listOne(userPt);
+ int sum = tCoursePackagePayments.stream().mapToInt(TCoursePackagePayment::getTotalClassHours).sum();
+ int sum1 = tCoursePackagePayments.stream().mapToInt(TCoursePackagePayment::getLaveClassHours).sum();
+ map.put("allCourse",sum-sum1);
+
+ //所有课包
+ List<TCoursePackage> coursePackages = tcpService.list();
+
+
+ // 年
+ List<CoursePackageStudent> list = cspsService.list(new LambdaQueryWrapper<CoursePackageStudent>().in(CoursePackageStudent::getAppUserId, userPt));
+
+
+ for (CoursePackageStudent coursePackageStudent : list) {
+ for (TCoursePackage coursePackage : coursePackages) {
+ if(coursePackageStudent.getCoursePackageId().equals(coursePackage.getId())){
+ if(ToolUtil.isEmpty(coursePackage.getNeedNum())){
+ coursePackageStudent.setNeedNum(0);
+ }else {
+ coursePackageStudent.setNeedNum(coursePackage.getNeedNum());
+ }
+ }
+ }
+ }
+
+ ArrayList<Object> integers = new ArrayList<>();
+ int year = cn.hutool.core.date.DateUtil.year(new Date());
+ for (int i = 0; i < 10; i++) {
+ integers.add(year-i);
+ }
+ List<Object> collect = integers.stream().sorted().collect(Collectors.toList());
+ // 年
+ ArrayList<Integer> years = new ArrayList<>();
+ for (Object o : collect) {
+ String s = o.toString();
+ List<CoursePackageStudent> collect1 = list.stream().filter(e -> e.getInsertTime().toString().contains(s)).filter(student -> student.getNeedNum() != null).collect(Collectors.toList());
+ int sum2 = collect1.stream().mapToInt(CoursePackageStudent::getNeedNum).sum();
+ years.add(sum2);
+ }
+
+ map.put("yearData",years);
+
+
+
+ ArrayList<Integer> months = new ArrayList<>();
+
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+
+ // 月
+ for (int i = 1; i <= 12; i++) {
+ String m=i+"";
+ if(i<10){
+ m="0"+i;
+ }
+ String s = year + "-" + m;
+ List<CoursePackageStudent> collect1 = list.stream().filter(e -> format.format(e.getInsertTime()).contains(s)).filter(student -> student.getNeedNum() != null).collect(Collectors.toList());
+ int sum2 = collect1.stream().mapToInt(CoursePackageStudent::getNeedNum).sum();
+ months.add(sum2);
+ }
+ map.put("monthData",months);
+
+ // 周
+ // 获取最近四周
+ LocalDateTime minNow = LocalDateTime.now().with(LocalTime.MIN);
+ LocalDateTime maxNow = LocalDateTime.now().with(LocalTime.MAX);
+ // 周度数据
+ LocalDateTime s1 = minNow.minusDays(6);
+ LocalDateTime s2 = maxNow;
+
+ LocalDateTime s3 = minNow.minusDays(13);
+ LocalDateTime s4 = maxNow.minusDays(6);
+
+
+ LocalDateTime s5 = minNow.minusDays(20);
+ LocalDateTime s6 = maxNow.minusDays(13);
+
+ LocalDateTime s7 = minNow.minusDays(27);
+ LocalDateTime s8 = maxNow.minusDays(20);
+ ArrayList<Object> weekData = new ArrayList<>();
+
+ int count = 0;
+
+ int count1 = 0;
+
+ int count2 = 0;
+
+ int count3 = 0;
+ for (CoursePackageStudent coursePackageStudent : list) {
+ if (coursePackageStudent.getNeedNum()==null){
+ continue;
+ }
+ // 如果到课状态为否 则不计算
+ if (coursePackageStudent.getSignInOrNot() != 0) {
+ Date insertTime = coursePackageStudent.getInsertTime();
+ Instant instant = insertTime.toInstant();
+ ZoneId zoneId = ZoneId.systemDefault();
+ LocalDateTime dateTime = instant.atZone(zoneId).toLocalDateTime();
+ if (dateTime.isAfter(s1) && dateTime.isBefore(s2)){
+
+ count+=coursePackageStudent.getNeedNum();
+ }else if(dateTime.isAfter(s3) && dateTime.isBefore(s4)){
+ count1+=coursePackageStudent.getNeedNum();
+ }else if(dateTime.isAfter(s5) && dateTime.isBefore(s6)){
+ count2+=coursePackageStudent.getNeedNum();
+ }else if(dateTime.isAfter(s7) && dateTime.isBefore(s8)){
+ count3+=coursePackageStudent.getNeedNum();
+ }
+
+ }
+ }
+ weekData.add(count3);
+ weekData.add(count2);
+ weekData.add(count1);
+ weekData.add(count);
+
+ map.put("weekData",weekData);
+
+
+ LocalDateTime currentDateTime = LocalDateTime.now();
+ List<Integer> amountByDay = new ArrayList<>(Collections.nCopies(7,0));
+ for (CoursePackageStudent coursePackageStudent : list) {
+ Date insertTime = coursePackageStudent.getInsertTime();
+ // 将 Date 转换为 LocalDateTime
+ LocalDateTime insertDateTime = LocalDateTime.ofInstant(insertTime.toInstant(), ZoneId.systemDefault());
+ // 计算日期与当前日期的差距
+ long daysDifference = ChronoUnit.DAYS.between(insertDateTime.toLocalDate(), currentDateTime.toLocalDate());
+ // 如果日期在七天内，累加金额
+ if (daysDifference >= 0 && daysDifference < 7) {
+ int index = (int) (6 - daysDifference); // 计算对应的索引位置
+ Integer needNum = coursePackageStudent.getNeedNum();
+ if (needNum!=null){
+ int i = amountByDay.get(index) + needNum;
+ amountByDay.set(index, i);
+ }
+
+ }
+ }
+ map.put("dayData", amountByDay);
+
+ return map;
+
+ }
+ @ResponseBody
+ @PostMapping("/coursePackagePayment/courseStore")
+ HashMap<String, Object> courseStore(@RequestBody List<Integer> userPt){
+ if(userPt.size()==0){
+ userPt.add(-1);
+ }
+ HashMap<String, Object> map = new HashMap<>();
+ List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.listOne(userPt);
+ int sum = tCoursePackagePayments.stream().mapToInt(TCoursePackagePayment::getTotalClassHours).sum();
+ int sum1 = tCoursePackagePayments.stream().mapToInt(TCoursePackagePayment::getLaveClassHours).sum();
+ map.put("allCourse",sum-sum1);
+
+ //所有课包
+ List<TCoursePackage> coursePackages = tcpService.list();
+
+
+ // 年
+ List<CoursePackageStudent> list = cspsService.list(new LambdaQueryWrapper<CoursePackageStudent>().in(CoursePackageStudent::getAppUserId, userPt));
+
+
+ for (CoursePackageStudent coursePackageStudent : list) {
+ for (TCoursePackage coursePackage : coursePackages) {
+ if(coursePackageStudent.getCoursePackageId().equals(coursePackage.getId())){
+ if(ToolUtil.isEmpty(coursePackage.getNeedNum())){
+ coursePackageStudent.setNeedNum(0);
+ }else {
+ coursePackageStudent.setNeedNum(coursePackage.getNeedNum());
+ }
+ }
+ }
+ }
+
+ ArrayList<Object> integers = new ArrayList<>();
+ int year = cn.hutool.core.date.DateUtil.year(new Date());
+ for (int i = 0; i < 10; i++) {
+ integers.add(year-i);
+ }
+ List<Object> collect = integers.stream().sorted().collect(Collectors.toList());
+ // 年
+ ArrayList<Integer> years = new ArrayList<>();
+ for (Object o : collect) {
+ String s = o.toString();
+ List<CoursePackageStudent> collect1 = list.stream().filter(e -> e.getInsertTime().toString().contains(s)).filter(student -> student.getNeedNum() != null).collect(Collectors.toList());
+ int sum2 = collect1.stream().mapToInt(CoursePackageStudent::getNeedNum).sum();
+ years.add(sum2);
+ }
+
+ map.put("yearData",years);
+
+
+
+ ArrayList<Integer> months = new ArrayList<>();
+
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+
+ // 月
+ for (int i = 1; i <= 12; i++) {
+ String m=i+"";
+ if(i<10){
+ m="0"+i;
+ }
+ String s = year + "-" + m;
+ List<CoursePackageStudent> collect1 = list.stream().filter(e -> format.format(e.getInsertTime()).contains(s)).filter(student -> student.getNeedNum() != null).collect(Collectors.toList());
+ int sum2 = collect1.stream().mapToInt(CoursePackageStudent::getNeedNum).sum();
+ months.add(sum2);
+ }
+ map.put("monthData",months);
+
+ // 周
+ // 获取最近四周
+ LocalDateTime minNow = LocalDateTime.now().with(LocalTime.MIN);
+ LocalDateTime maxNow = LocalDateTime.now().with(LocalTime.MAX);
+ // 周度数据
+ LocalDateTime s1 = minNow.minusDays(6);
+ LocalDateTime s2 = maxNow;
+
+ LocalDateTime s3 = minNow.minusDays(13);
+ LocalDateTime s4 = maxNow.minusDays(6);
+
+
+ LocalDateTime s5 = minNow.minusDays(20);
+ LocalDateTime s6 = maxNow.minusDays(13);
+
+ LocalDateTime s7 = minNow.minusDays(27);
+ LocalDateTime s8 = maxNow.minusDays(20);
+ ArrayList<Object> weekData = new ArrayList<>();
+
+ int count = 0;
+
+ int count1 = 0;
+
+ int count2 = 0;
+
+ int count3 = 0;
+ for (CoursePackageStudent coursePackageStudent : list) {
+ if (coursePackageStudent.getNeedNum()==null){
+ continue;
+ }
+ // 如果到课状态为否 则不计算
+ if (coursePackageStudent.getSignInOrNot() != 0) {
+ Date insertTime = coursePackageStudent.getInsertTime();
+ Instant instant = insertTime.toInstant();
+ ZoneId zoneId = ZoneId.systemDefault();
+ LocalDateTime dateTime = instant.atZone(zoneId).toLocalDateTime();
+ if (dateTime.isAfter(s1) && dateTime.isBefore(s2)){
+
+ count+=coursePackageStudent.getNeedNum();
+ }else if(dateTime.isAfter(s3) && dateTime.isBefore(s4)){
+ count1+=coursePackageStudent.getNeedNum();
+ }else if(dateTime.isAfter(s5) && dateTime.isBefore(s6)){
+ count2+=coursePackageStudent.getNeedNum();
+ }else if(dateTime.isAfter(s7) && dateTime.isBefore(s8)){
+ count3+=coursePackageStudent.getNeedNum();
+ }
+
+ }
+ }
+ weekData.add(count3);
+ weekData.add(count2);
+ weekData.add(count1);
+ weekData.add(count);
+
+ map.put("weekData",weekData);
+
+
+ LocalDateTime currentDateTime = LocalDateTime.now();
+ List<Integer> amountByDay = new ArrayList<>(Collections.nCopies(7,0));
+ for (CoursePackageStudent coursePackageStudent : list) {
+ Date insertTime = coursePackageStudent.getInsertTime();
+ // 将 Date 转换为 LocalDateTime
+ LocalDateTime insertDateTime = LocalDateTime.ofInstant(insertTime.toInstant(), ZoneId.systemDefault());
+ // 计算日期与当前日期的差距
+ long daysDifference = ChronoUnit.DAYS.between(insertDateTime.toLocalDate(), currentDateTime.toLocalDate());
+ // 如果日期在七天内，累加金额
+ if (daysDifference >= 0 && daysDifference < 7) {
+ int index = (int) (6 - daysDifference); // 计算对应的索引位置
+ Integer needNum = coursePackageStudent.getNeedNum();
+ if (needNum!=null){
+ int i = amountByDay.get(index) + needNum;
+ amountByDay.set(index, i);
+ }
+
+ }
+ }
+ map.put("dayData", amountByDay);
+
+ return map;
+
+ }
}
--
Gitblit v1.7.1