From 8c55ab2701c99cec16eff92a26fefdf77fcdd28f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 25 九月 2023 16:17:44 +0800
Subject: [PATCH] app接口修改
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 458 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 417 insertions(+), 41 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 8470385..e381c62 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
@@ -1,24 +1,28 @@
package com.dsh.course.controller;
+import com.alibaba.fastjson.JSON;
+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.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.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.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;
import com.dsh.course.model.vo.request.*;
-import com.dsh.course.model.vo.response.AppUserVideoResponse;
-import com.dsh.course.model.vo.response.CourseDetailsResponse;
-import com.dsh.course.model.vo.response.CourseOfVideoResponse;
+import com.dsh.course.model.vo.response.*;
import com.dsh.course.service.*;
import com.dsh.course.util.*;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -27,11 +31,15 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -40,10 +48,7 @@
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.util.*;
import java.util.stream.Collectors;
@Api
@@ -98,6 +103,16 @@
@Resource
private StoreClient sreClient;
+ @Autowired
+ private AppUserClient appUserClient;
+
+ @Autowired
+ private RestTemplate internalRestTemplate;
+
+ @Resource
+ private CoursePackageSchedulingMapper coursePackageSchedulingMapper;
+
+
private final SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");
/**
@@ -119,6 +134,7 @@
TCoursePackage tCoursePackage = tcpService.getById(tCoursePackagePayment.getCoursePackageId());
StuCourseResp resp = new StuCourseResp();
resp.setCourseId(tCoursePackage.getId());
+ resp.setId(tCoursePackagePayment.getId());
resp.setCourseName(tCoursePackage.getName());
resp.setTotalCourseNums(tCoursePackagePayment.getTotalClassHours());
resp.setResidueNums(tCoursePackagePayment.getLaveClassHours());
@@ -151,12 +167,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>()
@@ -180,6 +196,11 @@
storeVo.setLon(store.getLon());
storeVo.setCoursePrice(ToolUtil.isEmpty(paymentConfig.getCashPayment()) ? (double) paymentConfig.getPlayPaiCoin():paymentConfig.getCashPayment());
storeVo.setStatus(1);
+ // 2.0
+ storeVo.setAllNum(tCoursePackagePayment.getTotalClassHours());
+ storeVo.setLastNum(tCoursePackagePayment.getLaveClassHours());
+ storeVo.setUseNum(tCoursePackagePayment.getTotalClassHours()-tCoursePackagePayment.getLaveClassHours());
+
course.add(storeVo);
}
}
@@ -383,14 +404,16 @@
return paymentVos;
}
+
+ @ResponseBody
@PostMapping("/base/coursePack/allAmountPayRecordOfUser")
- public List<TCoursePackagePayment> getAmountPayRecord(@RequestBody BillingDataRequestVo billingDataRequestVo){
- return packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>()
- .eq("appUserId",billingDataRequestVo.getAppUserId())
- .notIn("payType",3)
- .eq("payStatus",2)
- .eq("state",1)
- .between("insertTime",billingDataRequestVo.getMonthStart(),billingDataRequestVo.getMonthEnd()));
+ public BillingRequestVo getAmountPayRecord(@RequestBody BillingDataRequestVo billingDataRequestVo){
+ BillingRequestVo requestVo = new BillingRequestVo();
+ List<BillingRequest> billingRequests = packagePaymentService.queryAmountDatas(billingDataRequestVo.getAppUserId(), billingDataRequestVo.getMonthStart(), billingDataRequestVo.getMonthEnd());
+ if (billingRequests.size() >0){
+ requestVo.setRequests(billingRequests);
+ }
+ return requestVo;
}
@@ -421,7 +444,6 @@
return ResultUtil.runErr();
}
}
-
/**
* 课后视频课表
@@ -476,6 +498,56 @@
}
}
+ @ResponseBody
+ @PostMapping("/api/startCource/payCourseInfo")
+ @ApiOperation(value = "课后练习-购课详情（用于购课）", tags = {"APP-开始上课"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ })
+ public ResultUtil<PayCourseInfoReq> payCourseInfo(Integer courseId){
+ try {
+ return ResultUtil.success(packagePaymentService.payCourseInfo(courseId));
+ }catch (Exception e){
+ return ResultUtil.runErr();
+ }
+ }
+
+ @ResponseBody
+ @PostMapping("/api/startCource/getMyCourseList")
+ @ApiOperation(value = "课后练习-可支付课程列表（用于购课）", tags = {"APP-开始上课"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ })
+ public ResultUtil<List<PayCourseRes>> getMyCourseList(Integer storeId){
+ try {
+ Integer appUserId = tokenUtil.getUserIdFormRedis();
+ if(null == appUserId){
+ return ResultUtil.tokenErr();
+ }
+ return ResultUtil.success(packagePaymentService.getMyCourseList(storeId,appUserId));
+ }catch (Exception e){
+ return ResultUtil.runErr();
+ }
+ }
+
+ // 2.0
+ @ResponseBody
+ @PostMapping("/api/startCource/payCourse")
+ @ApiOperation(value = "课后练习-确认购课", tags = {"APP-开始上课"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ })
+ public ResultUtil<?> payCourse(PayCourseReq req){
+ try {
+ Integer appUserId = tokenUtil.getUserIdFormRedis();
+ if(null == appUserId){
+ return ResultUtil.tokenErr();
+ }
+ return packagePaymentService.payCourse(req,appUserId);
+ }catch (Exception e){
+ return ResultUtil.runErr();
+ }
+ }
/**
* 更新课后视频学习状态
@@ -497,7 +569,6 @@
return ResultUtil.runErr();
}
}
-
@ResponseBody
@@ -541,7 +612,6 @@
}catch (Exception e){
return ResultUtil.runErr();
}
-
}
@@ -582,6 +652,10 @@
Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
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){
@@ -664,6 +738,22 @@
return 0;
}
}
+ /**
+ * 获取学员剩余课时
+ * @param id
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/coursePackagePayment/queryResidueClassHourById")
+ public Integer queryResidueClassHourById(@RequestBody Long id){
+ try {
+ TCoursePackagePayment list = packagePaymentService.getById(id);
+ return list.getLaveClassHours();
+ }catch (Exception e){
+ e.printStackTrace();
+ return 0;
+ }
+ }
/**
@@ -674,13 +764,31 @@
@PostMapping("/coursePackagePayment/paymentDeductionClassHour")
public void paymentDeductionClassHour(@RequestBody PaymentDeductionClassHour paymentDeductionClassHour){
try {
- List<TCoursePackagePayment> list = packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>().eq("studentId", paymentDeductionClassHour.getId()).eq("payStatus", 2)
+ // 2.0 用id进行查询
+ List<TCoursePackagePayment> list = packagePaymentService.list(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){
coursePackagePayment.setLaveClassHours(coursePackagePayment.getLaveClassHours() - classHour);
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"));
+ }
+ }
CancelledClasses cancelledClasses = new CancelledClasses();
cancelledClasses.setType(2);
@@ -736,6 +844,42 @@
/**
+ * 找出符合门店的课包
+ * @param s
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/coursePackagePayment/paymentCompetitionCourseList")
+ public List<PayCourseRes> paymentCompetitionCourseList(@RequestBody String s){
+ ArrayList<PayCourseRes> objects = new ArrayList<>();
+
+ String[] split = s.split("_");
+ // 用户id
+ Integer integer = Integer.valueOf(split[0]);
+ String s1 = split[1];
+ // 门店id
+ String[] split1 = s1.split(",");
+ ArrayList<Integer> storeIds = new ArrayList<>();
+ for (String s2 : split1) {
+ storeIds.add(Integer.valueOf(s2));
+ }
+ List<TCoursePackagePayment> list = packagePaymentService.list(new LambdaQueryWrapper<TCoursePackagePayment>().eq(TCoursePackagePayment::getAppUserId, integer).ge(TCoursePackagePayment::getLaveClassHours, 0).eq(TCoursePackagePayment::getStatus, 1).eq(TCoursePackagePayment::getState, 1));
+ for (TCoursePackagePayment tCoursePackagePayment : list) {
+ Integer coursePackageId = tCoursePackagePayment.getCoursePackageId();
+ TCoursePackage byId = tcpService.getById(coursePackageId);
+ if(storeIds.contains(byId.getStoreId())){
+ PayCourseRes payCourseRes = new PayCourseRes();
+ payCourseRes.setCourseNum(tCoursePackagePayment.getLaveClassHours());
+ payCourseRes.setId(tCoursePackagePayment.getId());
+ payCourseRes.setName(byId.getName());
+ objects.add(payCourseRes);
+ }
+ }
+ return objects;
+ }
+
+
+ /**
* 课包续费玩湃币支付
* @param
*/
@@ -763,6 +907,16 @@
appUser.setPlayPaiCoins(appUser.getPlayPaiCoins()-paymentConfig.getPlayPaiCoin());
auClitn.updateAppUser(appUser);
+
+ // 2.0
+ TCourseInfoRecord tCourseInfoRecord = new TCourseInfoRecord();
+ tCourseInfoRecord.setUserId(userIdFormRedis);
+ tCourseInfoRecord.setCourseId(coursePackage.getCoursePackageId());
+ tCourseInfoRecord.setName("续课");
+ tCourseInfoRecord.setTime(new Date());
+ tCourseInfoRecord.setType(1);
+ tCourseInfoRecord.setNum(paymentConfig.getClassHours());
+ auClitn.addCourseInfoRecord(tCourseInfoRecord);
} catch (Exception e) {
return 4;
}
@@ -775,18 +929,36 @@
.eq("code",code));
}
+
+ @PostMapping("/base/coursePack/getCoursePackagePaymentById")
+ public TCoursePackagePayment getCoursePackagePaymentById(@RequestBody Integer id){
+ return packagePaymentService.getById(id);
+ }
@PostMapping("/base/coursePack/delPaymentCoursePackage")
public boolean delPaymentCoursePackage(@RequestBody Integer payId){
return packagePaymentService.removeById(payId);
}
@PostMapping("/base/coursePack/updatePaymentCoursePackage")
public boolean updatePaymentCoursePackage(@RequestBody TCoursePackagePayment packagePayment){
- return packagePaymentService.update(packagePayment,new QueryWrapper<TCoursePackagePayment>()
- .eq("id",packagePayment.getId()));
+ boolean id = packagePaymentService.update(packagePayment, new QueryWrapper<TCoursePackagePayment>()
+ .eq("id", packagePayment.getId()));
+ if(id){
+ // 2.0
+ TCourseInfoRecord tCourseInfoRecord = new TCourseInfoRecord();
+ tCourseInfoRecord.setNum(packagePayment.getTotalClassHours());
+ tCourseInfoRecord.setName("续课");
+ tCourseInfoRecord.setCourseId(packagePayment.getCoursePackageId());
+ tCourseInfoRecord.setUserId(packagePayment.getAppUserId());
+ tCourseInfoRecord.setType(1);
+ tCourseInfoRecord.setTime(new Date());
+ id = appUserClient.addCourseInfoRecord(tCourseInfoRecord);
+ }
+ return id;
}
@PostMapping("/base/coursePack/savePaymentCoursePackage")
public boolean savePaymentCoursePackage(@RequestBody TCoursePackagePayment packagePayment){
+ packagePayment.setInsertTime(new Date());
return packagePaymentService.save(packagePayment);
}
@@ -817,13 +989,100 @@
}
+ // 2.0 送课时
+ @PostMapping("/base/coursePack/sendHours")
+ public Integer sendHours(@RequestBody String s){
+ String[] split = s.split("_");
+ TCoursePackagePayment byId = packagePaymentService.getById(Long.valueOf(split[0]));
+ byId.setTotalClassHours(byId.getTotalClassHours()+Integer.valueOf(split[2]));
+ boolean b = packagePaymentService.updateHoursById(byId,Integer.valueOf(split[2]));
+ if(b){
+ return 1;
+ }else {
+
+ return 0;
+ }
+ }
+
+
+ /**
+ * 查询课时
+ * @param courseConfigId
+ * @return
+ */
+ @PostMapping("/base/coursePack/getClassHour")
+ public Integer getClassHour(@RequestBody Integer courseConfigId){
+ CoursePackagePaymentConfig byId = icppcService.getById(courseConfigId);
+ return byId.getClassHours();
+ }
+
+ /**
+ * 获取课包报名信息列表
+ * @param queryRegistrationRecord
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/coursePackagePayment/queryRegistrationRecord")
+ public Page<Map<String, Object>> queryRegistrationRecord(@RequestBody QueryRegistrationRecord queryRegistrationRecord){
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage(queryRegistrationRecord.getLimit(), queryRegistrationRecord.getOffset(), queryRegistrationRecord.getSort(), queryRegistrationRecord.getOrder());
+ Page<Map<String, Object>> mapPage = page.setRecords(packagePaymentService.queryRegistrationRecord(page, queryRegistrationRecord));
+ return mapPage;
+ }
+
+
+ /**
+ * 获取未预约排课学员列表
+ * @param queryWalkInStudentList
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/coursePackagePayment/queryWalkInStudentList")
+ public Page<Map<String, Object>> queryWalkInStudentList(@RequestBody QueryWalkInStudentList queryWalkInStudentList){
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage(queryWalkInStudentList.getLimit(), queryWalkInStudentList.getOffset(), queryWalkInStudentList.getSort(), queryWalkInStudentList.getOrder());
+ Page<Map<String, Object>> mapPage = page.setRecords(packagePaymentService.queryWalkInStudentList(page, queryWalkInStudentList));
+ return mapPage;
+ }
+
+
+ /**
+ * 根据id获取数据
+ * @param id
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/coursePackagePayment/queryCoursePackagePaymentById")
+ public TCoursePackagePayment queryCoursePackagePaymentById(@RequestBody 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;
+ }
+
+
+ /**
+ * 修改数据
+ * @param coursePackagePayment
+ */
+ @ResponseBody
+ @PostMapping("/coursePackagePayment/editCoursePackagePayment")
+ public void editCoursePackagePayment(TCoursePackagePayment coursePackagePayment){
+ packagePaymentService.updateById(coursePackagePayment);
+ }
+
/**
* 上课主页-预约操作
*/
@ResponseBody
@PostMapping("/api/startCource/reverse")
- @ApiOperation(value = "上课主页-预约操作", tags = {"APP-开始上课"})
+ @ApiOperation(value = "上课主页-预约操作--2.0改请假操作", tags = {"APP-开始上课"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(value = "课包id", name = "courseID", required = true, dataType = "String"),
@@ -837,34 +1096,31 @@
if(null == appUserId){
return ResultUtil.tokenErr();
}
- TCoursePackagePayment packagePayment = packagePaymentService.getOne(new LambdaQueryWrapper<TCoursePackagePayment>()
- .eq(TCoursePackagePayment::getId,courseID )
+ 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<CoursePackageStudent> coursePackageStudent = cspsService.list(new LambdaQueryWrapper<CoursePackageStudent>()
+ .in(CoursePackageStudent::getCoursePackagePaymentId,packagePayment.stream().map(TCoursePackagePayment::getId).collect(Collectors.toList()))
+ .eq(CoursePackageStudent::getCoursePackageId,courseID)
.eq(CoursePackageStudent::getStudentId,stuId)
.eq(CoursePackageStudent::getAppUserId,appUserId)
);
- if (ToolUtil.isNotEmpty(coursePackageStudent) && coursePackageStudent.getReservationStatus() == 0){
- coursePackageStudent.setReservationStatus(1);
- 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.setAppUserId(appUserId);
- coursePackageStudent.setStudentId(stuId);
- coursePackageStudent.setCoursePackageId(packagePayment.getCoursePackageId());
- coursePackageStudent.setCoursePackagePaymentId(Long.parseLong(courseID));
- coursePackageStudent.setReservationStatus(1);
- coursePackageStudent.setInsertTime(simpleDateFormat.parse(time));
- cspsService.save(coursePackageStudent);
}
return ResultUtil.success();
}catch (Exception e){
@@ -872,4 +1128,124 @@
}
}
+ @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).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<>();
+ for (int i1 = 0; i1 < split.length; i1++) {
+ String s = split[i1] + "-" + split1[i1];
+ 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())
+ );
+ 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)
+ );
+
+ detailsListVo.setType(1);
+ if(list4.size()>0){
+ Integer signInOrNot = list4.get(0).getSignInOrNot();
+ if(signInOrNot==2){
+ detailsListVo.setType(3);
+ }
+ }
+
+ } 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;
+ }
+
}
--
Gitblit v1.7.1