From 53e7558400dcacecdce70e39ebfe1727740f9296 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 25 十一月 2023 17:20:06 +0800
Subject: [PATCH] 重写课包支付和排课逻辑
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 606 ++++++++++++++++++++++++++----------------------------
1 files changed, 289 insertions(+), 317 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
index 6a521f0..3d6656f 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -123,9 +123,6 @@
private RestTemplate internalRestTemplate;
-
-
-
@Override
public List<CoursePackagePaymentVO> listAll(CoursePackagePaymentQuery query) {
return cpConfigMapper.listAll(query);
@@ -139,7 +136,7 @@
long value = Long.parseLong(id);
list.add(value);
}
- return cpConfigMapper.changeState(list,dto.getPayUserName(),dto.getUserId());
+ return cpConfigMapper.changeState(list, dto.getPayUserName(), dto.getUserId());
}
@Override
@@ -155,7 +152,7 @@
STime = query.getRegisterTime().split(" - ")[0] + " 00:00:00";
ETime = query.getRegisterTime().split(" - ")[1] + " 23:59:59";
}
- return cpConfigMapper.listAllRegister(query,STime,ETime,query.getAmount());
+ return cpConfigMapper.listAllRegister(query, STime, ETime, query.getAmount());
}
@Override
@@ -176,10 +173,10 @@
BigDecimal cashPayment = (BigDecimal) student.get("cashPayment");
BigDecimal totalClassHours = (BigDecimal) student.get("totalClassHours");
BigDecimal hasHours = (BigDecimal) student.get("hasHours");
- if (cashPayment==null){
+ if (cashPayment == null) {
continue;
}
- if (totalClassHours.compareTo(BigDecimal.ZERO)==0){
+ if (totalClassHours.compareTo(BigDecimal.ZERO) == 0) {
totalClassHours = totalClassHours.add(new BigDecimal("1"));
}
BigDecimal hasPayment = cashPayment.divide(totalClassHours, 2, RoundingMode.HALF_UP)
@@ -187,11 +184,11 @@
student.put("hasPayment", hasPayment);
}
- if (studentQeryDto.getCityCode()!=null&&studentQeryDto.getCityCode()!="") {
+ if (studentQeryDto.getCityCode() != null && studentQeryDto.getCityCode() != "") {
String value = studentQeryDto.getCityCode();
boolean allZeros = value.substring(value.length() - 4).endsWith("0000");
System.out.println(allZeros); // Output: true
- if (allZeros){
+ if (allZeros) {
Iterator<Map<String, Object>> iterator = studentTotal.iterator();
while (iterator.hasNext()) {
Map<String, Object> student = iterator.next();
@@ -200,22 +197,23 @@
iterator.remove(); // Remove the element from the list
}
}
- }else{
- Iterator<Map<String, Object>> iterator = studentTotal.iterator();
- while (iterator.hasNext()) {
- Map<String, Object> student = iterator.next();
- String cityCode = (String) student.get("cityCode");
- if (!cityCode.equals(studentQeryDto.getCityCode())) {
- iterator.remove(); // Remove the element from the list
+ } else {
+ Iterator<Map<String, Object>> iterator = studentTotal.iterator();
+ while (iterator.hasNext()) {
+ Map<String, Object> student = iterator.next();
+ String cityCode = (String) student.get("cityCode");
+ if (!cityCode.equals(studentQeryDto.getCityCode())) {
+ iterator.remove(); // Remove the element from the list
+ }
}
- }}
+ }
}
- if (studentQeryDto.getStudentName()!=null&&studentQeryDto.getStudentName()!=""){
+ if (studentQeryDto.getStudentName() != null && studentQeryDto.getStudentName() != "") {
List<Map<String, Object>> totallike = new ArrayList<>();
for (Map<String, Object> student : studentTotal) {
String studentName = (String) student.get("studentName");
- if (studentName.contains(studentQeryDto.getStudentName())){
+ if (studentName.contains(studentQeryDto.getStudentName())) {
totallike.add(student);
}
@@ -227,12 +225,12 @@
@Override
public List<Map<String, Object>> bypac(PacQueryDto pacQueryDto) {
- if (pacQueryDto.getCityCode()!=null&&pacQueryDto.getCityCode()!=""){
+ if (pacQueryDto.getCityCode() != null && pacQueryDto.getCityCode() != "") {
String value = pacQueryDto.getCityCode();
boolean allZeros = value.substring(value.length() - 4).endsWith("0000");
System.out.println(allZeros); // Output: true
- if (allZeros){
+ if (allZeros) {
pacQueryDto.setProvinceCode(pacQueryDto.getCityCode());
pacQueryDto.setCityCode(null);
}
@@ -240,11 +238,11 @@
}
List<Map<String, Object>> maps = this.baseMapper.pacQueryDto(pacQueryDto);
- if (pacQueryDto.getName()!=null&&pacQueryDto.getName()!=""){
+ if (pacQueryDto.getName() != null && pacQueryDto.getName() != "") {
List<Map<String, Object>> totallike = new ArrayList<>();
for (Map<String, Object> student : maps) {
String studentName = (String) student.get("name");
- if (studentName.contains(pacQueryDto.getName())){
+ if (studentName.contains(pacQueryDto.getName())) {
totallike.add(student);
}
@@ -268,6 +266,7 @@
/**
* 获取课包购买人数
+ *
* @param coursePackageId
* @return
*/
@@ -277,20 +276,20 @@
}
@Override
- public List<AppUserVideoResponse> queryAfterVideo(CourseOfAfterRequest search,List<Integer> courseIds) {
+ public List<AppUserVideoResponse> queryAfterVideo(CourseOfAfterRequest search, List<Integer> courseIds) {
List<AppUserVideoResponse> responses = new ArrayList<>();
List<PostCourseVideo> videoList = new ArrayList<>();
LambdaQueryWrapper<PostCourseVideo> queryWrapper = new LambdaQueryWrapper<PostCourseVideo>();
- if (courseIds.size() > 0 ){
- queryWrapper.in(PostCourseVideo::getCoursePackageId,courseIds);
+ if (courseIds.size() > 0) {
+ queryWrapper.in(PostCourseVideo::getCoursePackageId, courseIds);
}
videoList = pcvMapper.selectList(queryWrapper);
System.out.println(videoList);
- if (videoList.size() > 0){
+ if (videoList.size() > 0) {
List<Integer> videoIds = videoList.stream().map(PostCourseVideo::getCourseId).collect(Collectors.toList());
List<UserVideoDetails> userVideoDetails = uvdmapper.selectList(new QueryWrapper<UserVideoDetails>()
.in("courseId", videoIds));
- if (userVideoDetails.size() > 0){
+ if (userVideoDetails.size() > 0) {
for (UserVideoDetails userVideoDetail : userVideoDetails) {
AppUserVideoResponse response = new AppUserVideoResponse();
TCoursePackage coursePackage = tcpmapper.selectById(userVideoDetail.getCoursePackageId());
@@ -307,12 +306,12 @@
}
Collections.sort(responses, Comparator.comparing(AppUserVideoResponse::getStudyStatus));
}
- if (ToolUtil.isNotEmpty(search.getSearch())){
+ if (ToolUtil.isNotEmpty(search.getSearch())) {
responses = responses.stream()
.filter(person -> person.getPackageName().contains(search.getSearch()))
.collect(Collectors.toList());
}
- if (ToolUtil.isNotEmpty(search.getCourseTypeId())){
+ if (ToolUtil.isNotEmpty(search.getCourseTypeId())) {
responses = responses.stream()
.filter(person -> Objects.equals(person.getCoursePackageId(), search.getCourseTypeId()))
.collect(Collectors.toList());
@@ -320,39 +319,41 @@
}
return responses;
}
+
@Autowired
private TCourseService courseService;
+
@Override
- public CourseOfVideoResponse queryVideoDetails(CourseWithDetailsRequest detailsRequest,Integer appUserId) {
+ public CourseOfVideoResponse queryVideoDetails(CourseWithDetailsRequest detailsRequest, Integer appUserId) {
CourseOfVideoResponse response = new CourseOfVideoResponse();
// BenefitsVideos videosWithIds = bfvoClient.getVideosWithIds(detailsRequest.getVideoId());
TCourse byId = courseService.getById(detailsRequest.getVideoId());
TCoursePackage coursePackage = tcpmapper.selectById(detailsRequest.getCoursePackageId());
CoursePackageScheduling byId1 = new CoursePackageScheduling();
- if (detailsRequest.getScId()!=null){
+ if (detailsRequest.getScId() != null) {
byId1 = coursePackageSchedulingService.getById(detailsRequest.getScId());
}
- if (null != coursePackage){
+ if (null != coursePackage) {
response.setCoursePackageId(coursePackage.getId());
response.setVideoId(byId.getId());
response.setVideoURL(byId.getCourseVideo());
response.setVideoName(coursePackage.getName());
UserVideoDetails userVideoDetails = uvdmapper.selectOne(new QueryWrapper<UserVideoDetails>()
- .eq("appUserId",appUserId )
- .eq("coursePackageId",coursePackage.getId())
- .eq("courseId",detailsRequest.getVideoId()));
+ .eq("appUserId", appUserId)
+ .eq("coursePackageId", coursePackage.getId())
+ .eq("courseId", detailsRequest.getVideoId()));
- if (userVideoDetails!=null) {
+ if (userVideoDetails != null) {
response.setStudyStatus(userVideoDetails.getState());
- }else {
+ } else {
response.setStudyStatus(1);
}
response.setPackageName(coursePackage.getName());
response.setSynopsis(byId.getIntroduce());
response.setDetailedDiagram(byId.getIntroductionDrawing());
response.setCover(byId.getCoverDrawing());
- if (byId1.getIntegral()!=null) {
+ if (byId1.getIntegral() != null) {
response.setIntegral(String.valueOf(byId1.getIntegral()));
}
@@ -364,11 +365,11 @@
@Override
public String updateVideoStatus(UpdateCourseVideoStatusRequest detailsRequest, Integer appUserId) {
UserVideoDetails userVideoDetails = uvdmapper.selectOne(new QueryWrapper<UserVideoDetails>()
- .eq("appUserId",appUserId )
- .eq("coursePackageId",detailsRequest.getCoursePackageId())
- .eq("courseId",detailsRequest.getVideoId())
- );
- if (null != userVideoDetails && userVideoDetails.getState() ==1 && detailsRequest.getIsOver() == 1){
+ .eq("appUserId", appUserId)
+ .eq("coursePackageId", detailsRequest.getCoursePackageId())
+ .eq("courseId", detailsRequest.getVideoId())
+ );
+ if (null != userVideoDetails && userVideoDetails.getState() == 1 && detailsRequest.getIsOver() == 1) {
userVideoDetails.setState(2);
userVideoDetails.setUpdateTime(new Date());
uvdmapper.updateById(userVideoDetails);
@@ -379,7 +380,7 @@
@Autowired
private TOrderService orderService;
-
+
@Override
public List<RegisterCourseVo> queryRegisteredCourseList(CourseOfAfterRequest courseTypeId, Integer appUserId) {
List<RegisterCourseVo> courseVos = new ArrayList<>();
@@ -404,11 +405,8 @@
// .in("id",paysId ));
-
-
-
System.out.println(tCoursePackagePayments);
- if (tCoursePackagePayments.size() > 0){
+ if (tCoursePackagePayments.size() > 0) {
try {
for (TCoursePackagePayment tCoursePackagePayment : tCoursePackagePayments) {
TCoursePackage coursePackage = tcpmapper.selectById(tCoursePackagePayment.getCoursePackageId());
@@ -417,38 +415,38 @@
// 2.0
registerCourseVo.setType(coursePackage.getType());
- registerCourseVo.setOrderId(tCoursePackagePayment.getOrderId());
+ registerCourseVo.setOrderId(tCoursePackagePayment.getOrderId().longValue());
registerCourseVo.setCoursePayId(tCoursePackagePayment.getId());
registerCourseVo.setCoursePackageId(tCoursePackagePayment.getCoursePackageId());
registerCourseVo.setCoursePackTypeId(coursePackage.getCoursePackageTypeId());
registerCourseVo.setPackageImg(coursePackage.getCoverDrawing());
- String storeAndCourse = coursePackage.getName()+"("+ store.getName() +")";
+ String storeAndCourse = coursePackage.getName() + "(" + store.getName() + ")";
registerCourseVo.setCourseNameStore(storeAndCourse);
// registerCourseVo.setCourseTime(coursePackage.getClassStartTime()+"-"+coursePackage.getClassEndTime());
// 2.0
registerCourseVo.setCourseTime(new SimpleDateFormat("yyyy-MM-dd").format(tCoursePackagePayment.getInsertTime()));
Coach coach = coachClient.queryCoachById(coursePackage.getCoachId());
registerCourseVo.setCourseTeacher(ToolUtil.isEmpty(coach) ? "" : coach.getName());
- if (coursePackage.getType()==2) {
+ if (coursePackage.getType() == 2) {
registerCourseVo.setTime(new SimpleDateFormat("yyyy-MM-dd").format(coursePackage.getStartTime()) + "-" + new SimpleDateFormat("yyyy-MM-dd").format(coursePackage.getEndTime()));
}
List<CoursePackageStudent> coursePackageStudents = cpsMapper.selectList(new QueryWrapper<CoursePackageStudent>()
- .eq("coursePackageId",coursePackage.getId())
- .eq("appUserId",appUserId ));
+ .eq("coursePackageId", coursePackage.getId())
+ .eq("appUserId", appUserId));
List<Long> ids = new ArrayList<>();
for (CoursePackageStudent coursePackageStudent : coursePackageStudents) {
ids.add(coursePackageStudent.getCoursePackageSchedulingId());
}
- List<CoursePackageScheduling> cps =new ArrayList<>();
+ List<CoursePackageScheduling> cps = new ArrayList<>();
if (!ids.isEmpty()) {
- cps = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>().in("id", ids));
+ cps = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>().in("id", ids));
}
Integer counts = 0;
for (CoursePackageScheduling cp : cps) {
- if (cp.getDeductClassHour()!=null) {
+ if (cp.getDeductClassHour() != null) {
counts = counts + cp.getDeductClassHour();
}
}
@@ -458,7 +456,7 @@
// .eq("coursePackageId",coursePackage.getId())
// .eq("appUserId",appUserId ));
- if (coursePackageStudents.size() > 0 ){
+ if (coursePackageStudents.size() > 0) {
// registerCourseVo.setCourseNums(coursePackageStudents.size() * 2);
registerCourseVo.setCourseNums(counts);
}
@@ -467,23 +465,23 @@
courseVos.add(registerCourseVo);
}
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
- if (ToolUtil.isNotEmpty(courseTypeId.getSearch())){
+ if (ToolUtil.isNotEmpty(courseTypeId.getSearch())) {
courseVos = courseVos.stream()
.filter(person -> person.getCourseNameStore().contains(courseTypeId.getSearch()))
.collect(Collectors.toList());
}
- if (ToolUtil.isNotEmpty(courseTypeId.getCourseTypeId())){
+ if (ToolUtil.isNotEmpty(courseTypeId.getCourseTypeId())) {
courseVos = courseVos.stream()
.filter(person -> Objects.equals(person.getCoursePackTypeId(), courseTypeId.getCourseTypeId()))
.collect(Collectors.toList());
}
- if (courseVos.size() > 0 ){
+ if (courseVos.size() > 0) {
courseVos = courseVos.stream()
.sorted(Comparator.comparingInt(person -> person.getPayStatus() == 1 ? -1 : 1))
.collect(Collectors.toList());
@@ -493,70 +491,56 @@
}
@Autowired
- private ICoursePackagePaymentConfigService coursePackagePaymentConfigService;
+ private ICoursePackagePaymentConfigService coursePackagePaymentConfigService;
@Autowired
- private TCoursePackageDiscountService coursePackageDiscountService;
+ private TCoursePackageDiscountService coursePackageDiscountService;
+
+ @Resource
+ StoreClient storeClient;
+
+ @Autowired
+ private ICoursePackageOrderService coursePackageOrderService;
- @Resource StoreClient storeClient;
@Override
- public CourseDetailsResponse queryRegisteredCourseDetails(Long coursePayId, Integer appUserId,String lon,String lat) {
+ public CourseDetailsResponse queryRegisteredCourseDetails(Long coursePayId, Integer appUserId, String lon, String lat) {
AppUser appUser = appuClient.queryAppUser(appUserId);
CourseDetailsResponse response = new CourseDetailsResponse();
- TCoursePackagePayment tCoursePackagePayment = this.baseMapper.selectById(coursePayId);
-// List<TCoursePackagePayment> tCoursePackagePayments = this.baseMapper.selectList(new QueryWrapper<TCoursePackagePayment>().eq("appUserId", appUserId).eq("coursePackageId", tCoursePackagePayment.getCoursePackageId()));
-// List<Integer> stuIds = new ArrayList<>();
-// for (TCoursePackagePayment coursePackagePayment : tCoursePackagePayments) {
-// stuIds.add(coursePackagePayment.getStudentId());
-// }
-// response.setStuIds(stuIds);
- response.setChooseHours(tCoursePackagePayment.getClassHours());
+ CoursePackageOrder coursePackageOrder = coursePackageOrderService.getById(coursePayId);
+ response.setChooseHours(coursePackageOrder.getClassHours());
-
- if (null != tCoursePackagePayment){
- TCoursePackage coursePackage = tcpmapper.selectById(tCoursePackagePayment.getCoursePackageId());
- if (coursePackage.getType()==2) {
+ if (null != coursePackageOrder) {
+ TCoursePackage coursePackage = tcpmapper.selectById(coursePackageOrder.getCoursePackageId());
+ if (coursePackage.getType() == 2) {
response.setTime(new SimpleDateFormat("yyyy.MM.dd").format(coursePackage.getStartTime()) + "-" + new SimpleDateFormat("yyyy.MM.dd").format(coursePackage.getEndTime()));
}
-
Store store = storeClient.queryStoreById(coursePackage.getStoreId());
response.setStoreName(store.getName());
- if(ToolUtil.isNotEmpty(lon) && ToolUtil.isNotEmpty(lat)){
+ if (ToolUtil.isNotEmpty(lon) && ToolUtil.isNotEmpty(lat)) {
Map<String, Double> distance = GeodesyUtil.getDistance(lon + "," + lat, store.getLon() + "," + store.getLat());
double wgs84 = new BigDecimal(distance.get("WGS84")).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
response.setDistance(wgs84);
}
-
-
-
-
-
- response.setCoursePackageId(tCoursePackagePayment.getCoursePackageId());
+ response.setCoursePackageId(coursePackageOrder.getCoursePackageId());
response.setCoverDrawing(coursePackage.getCoverDrawing());
response.setDetailDrawing(coursePackage.getDetailDrawing());
response.setCoursePackageName(coursePackage.getName());
- response.setCoursePayId(tCoursePackagePayment.getId());
+ response.setCoursePayId(coursePackageOrder.getId());
response.setType(coursePackage.getType());
List<Integer> integers = StrUtils.dealStrToList(coursePackage.getClassWeeks());
String classWeeks = coursePackage.getClassWeeks();
- if (integers.size() > 0){
- StringBuilder courWeeks = new StringBuilder("每"+classWeeks);
-// for (Integer integer : integers) {
-// courWeeks.append(integer).append("、");
-// }
-// if (courWeeks.length() > 0 && courWeeks.charAt(courWeeks.length() - 1) == '、'){
-// courWeeks.deleteCharAt(courWeeks.length() - 1);
-// }
+ if (integers.size() > 0) {
+ StringBuilder courWeeks = new StringBuilder("每" + classWeeks);
response.setWeeks(courWeeks.toString());
}
ArrayList<String> classTime = new ArrayList<>();
String[] split4 = coursePackage.getClassStartTime().split(",");
String[] split3 = coursePackage.getClassEndTime().split(",");
- if(ToolUtil.isNotEmpty(coursePackage.getClassStartTime())){
+ if (ToolUtil.isNotEmpty(coursePackage.getClassStartTime())) {
for (int i = 0; i < split4.length; i++) {
- String s = split4[i].substring(0,5) + "-" + split3[i].substring(0,5);
+ String s = split4[i].substring(0, 5) + "-" + split3[i].substring(0, 5);
classTime.add(s);
}
}
@@ -566,24 +550,23 @@
response.setCourseTimeFrame(joinedString);
-// response.setCourseTimeFrame(coursePackage.getClassStartTime()+"-"+coursePackage.getClassEndTime());
response.setIntroduceDrawing(coursePackage.getIntroduceDrawing());
- Integer payType = tCoursePackagePayment.getPayType();
- BigDecimal cashPayment = tCoursePackagePayment.getCashPayment();
+ Integer payType = coursePackageOrder.getPayType();
+ BigDecimal cashPayment = coursePackageOrder.getCashPayment();
double cashPaymentValue = 0.0;
- if(cashPayment!=null){
+ if (cashPayment != null) {
- cashPaymentValue = cashPayment.doubleValue();
+ cashPaymentValue = cashPayment.doubleValue();
}
- Integer playPaiCoin = tCoursePackagePayment.getPlayPaiCoin();
+ Integer playPaiCoin = coursePackageOrder.getPlayPaiCoin();
TCoursePackageDiscount coursePackageDiscount = tcpdMapper.selectOne(new QueryWrapper<TCoursePackageDiscount>()
- .eq("coursePackageId",coursePackage.getId() )
- .eq("type",1)
- .eq("auditStatus",2));
+ .eq("coursePackageId", coursePackage.getId())
+ .eq("type", 1)
+ .eq("auditStatus", 2));
ObjectMapper objectMapper = new ObjectMapper();
double discountMember = 0.0;
- if(coursePackageDiscount!=null){
+ if (coursePackageDiscount != null) {
String content = coursePackageDiscount.getContent();
DiscountJsonDto discountJsonDto = null;
try {
@@ -605,10 +588,7 @@
break;
}
-// coursePackage.get
-
-
- response.setPayStatus(tCoursePackagePayment.getPayStatus());
+ response.setPayStatus(coursePackageOrder.getPayStatus());
List<CoursePackagePaymentConfigVo> list = new ArrayList<>();
@@ -619,23 +599,23 @@
coursePackagePaymentConfigVo.setClassHours(coursePackagePaymentConfig.getClassHours());
coursePackagePaymentConfigVo.setPlayPaiCoin(coursePackagePaymentConfig.getPlayPaiCoin());
- if(ToolUtil.isNotEmpty(coursePackagePaymentConfig.getCashPayment()) && coursePackagePaymentConfig.getCashPayment()>0 && ToolUtil.isNotEmpty(coursePackagePaymentConfig.getPlayPaiCoin()) && coursePackagePaymentConfig.getPlayPaiCoin()>0 ){
+ if (ToolUtil.isNotEmpty(coursePackagePaymentConfig.getCashPayment()) && coursePackagePaymentConfig.getCashPayment() > 0 && ToolUtil.isNotEmpty(coursePackagePaymentConfig.getPlayPaiCoin()) && coursePackagePaymentConfig.getPlayPaiCoin() > 0) {
coursePackagePaymentConfigVo.setPayType(3);
- }else if(ToolUtil.isNotEmpty(coursePackagePaymentConfig.getCashPayment()) && coursePackagePaymentConfig.getCashPayment()>0){
+ } else if (ToolUtil.isNotEmpty(coursePackagePaymentConfig.getCashPayment()) && coursePackagePaymentConfig.getCashPayment() > 0) {
coursePackagePaymentConfigVo.setPayType(1);
- }else if( ToolUtil.isNotEmpty(coursePackagePaymentConfig.getPlayPaiCoin()) && coursePackagePaymentConfig.getPlayPaiCoin()>0 ){
+ } else if (ToolUtil.isNotEmpty(coursePackagePaymentConfig.getPlayPaiCoin()) && coursePackagePaymentConfig.getPlayPaiCoin() > 0) {
coursePackagePaymentConfigVo.setPayType(2);
}
// coursePackagePaymentConfigVo.setPayType(coursePackage.getPayType());
//会员显示原价和支付价（会员价）。非会员显示会员价和支付价（最低）
- if(appUser.getIsVip() == 0){//非会员
+ if (appUser.getIsVip() == 0) {//非会员
List<TCoursePackageDiscount> list2 = coursePackageDiscountService.list(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", coursePackagePaymentConfig.getId())
.eq("type", 1).eq("auditStatus", 2));
Double vipPrice = coursePackagePaymentConfig.getCashPayment();
for (TCoursePackageDiscount coursePackageDiscount1 : list2) {
Double num1 = JSON.parseObject(coursePackageDiscount1.getContent()).getDouble("discountMember");
- if(vipPrice.compareTo(num1) > 0){
+ if (vipPrice.compareTo(num1) > 0) {
vipPrice = num1;
}
}
@@ -668,19 +648,19 @@
Date startDate_date = sdf.parse(startDate);
Date endDate_date = sdf.parse(endDate);
long timeMillis = System.currentTimeMillis();
- if(timeMillis >= startDate_date.getTime() && timeMillis < endDate_date.getTime()){
+ if (timeMillis >= startDate_date.getTime() && timeMillis < endDate_date.getTime()) {
Date date = new Date();
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
int week = calendar.get(Calendar.DAY_OF_WEEK);
boolean isFirstSunday = (calendar.getFirstDayOfWeek() == Calendar.SUNDAY);
- if(isFirstSunday){
+ if (isFirstSunday) {
week = week - 1;
- if(week == 0){
+ if (week == 0) {
week = 7;
}
}
- if(!weeks.contains(week)){
+ if (!weeks.contains(week)) {
continue;
}
@@ -700,18 +680,18 @@
e.set(Calendar.MINUTE, Integer.valueOf(split2[1]));
e.set(Calendar.SECOND, Integer.valueOf(split2[2]));
- if(hour1 > hour2){
- if(s.getTimeInMillis() > date.getTime()){
+ if (hour1 > hour2) {
+ if (s.getTimeInMillis() > date.getTime()) {
s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) - 1);
- }else{
+ } else {
e.set(Calendar.DAY_OF_YEAR, e.get(Calendar.DAY_OF_YEAR) + 1);
}
}
- if(timeMillis >= s.getTimeInMillis() && timeMillis < e.getTimeInMillis() && paymentPrice.compareTo(cashPayment2) > 0){
+ if (timeMillis >= s.getTimeInMillis() && timeMillis < e.getTimeInMillis() && paymentPrice.compareTo(cashPayment2) > 0) {
paymentPrice = cashPayment2;
}
}
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -726,27 +706,26 @@
Double vipcontinuingMember = JSON.parseObject(discount.getContent()).getDouble("continuingMember");
- if (coursePackagePaymentConfigVo.getPaymentPrice()>continuingMember){
+ if (coursePackagePaymentConfigVo.getPaymentPrice() > continuingMember) {
coursePackagePaymentConfigVo.setPaymentPrice(continuingMember);
}
- if (coursePackagePaymentConfigVo.getVipPrice()>vipcontinuingMember){
+ if (coursePackagePaymentConfigVo.getVipPrice() > vipcontinuingMember) {
coursePackagePaymentConfigVo.setVipPrice(vipcontinuingMember);
}
- if (coursePackagePaymentConfigVo.getPaymentPrice()<coursePackagePaymentConfigVo.getVipPrice()){
+ if (coursePackagePaymentConfigVo.getPaymentPrice() < coursePackagePaymentConfigVo.getVipPrice()) {
coursePackagePaymentConfigVo.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
coursePackagePaymentConfigVo.setVipPrice(null);
}
- }
- else{
+ } else {
List<TCoursePackageDiscount> list2 = coursePackageDiscountService.list(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", coursePackagePaymentConfig.getId())
.eq("type", 1).eq("auditStatus", 2));
Double vipPrice = coursePackagePaymentConfig.getCashPayment();
for (TCoursePackageDiscount coursePackageDiscount3 : list2) {
Double num1 = JSON.parseObject(coursePackageDiscount3.getContent()).getDouble("discountMember");
- if(vipPrice.compareTo(num1) > 0){
+ if (vipPrice.compareTo(num1) > 0) {
vipPrice = num1;
}
}
@@ -756,11 +735,6 @@
list.add(coursePackagePaymentConfigVo);
});
response.setList(list);
-
-
-
-
-
}
return response;
}
@@ -772,15 +746,15 @@
String code = "";
BigDecimal money = tCoursePackagePayment.getCashPayment();
Integer wpGold = tCoursePackagePayment.getPlayPaiCoin();
- if (tCoursePackagePayment.getPayStatus() == 1){
+ if (tCoursePackagePayment.getPayStatus() == 1) {
// 待支付的订单
code = tCoursePackagePayment.getCode();
tCoursePackagePayment.setPayType(request.getPayType());
- if (request.getUseConpon() == 1){
+ if (request.getUseConpon() == 1) {
tCoursePackagePayment.setUserCouponId(Long.valueOf(request.getUseConpon()));
}
this.baseMapper.updateById(tCoursePackagePayment);
- }else {
+ } else {
// 续课的订单
// 查询是否续课优惠
@@ -792,13 +766,13 @@
.eq("type", 2)
.eq("auditStatus", 1)
.eq("coursePackagePaymentConfigId", paymentConfig.getCoursePackageId()));
- if (ToolUtil.isNotEmpty(coursePackageDiscount)){
+ if (ToolUtil.isNotEmpty(coursePackageDiscount)) {
String content = coursePackageDiscount.getContent();
JSONObject jsonObject = JSON.parseObject(content);
- if (userIdFormRedis.getIsVip() == 1){
+ if (userIdFormRedis.getIsVip() == 1) {
Double jsonObjectDouble = jsonObject.getDouble("num1");
money = BigDecimal.valueOf(jsonObjectDouble);
- }else {
+ } else {
Double jsonObjectDouble = jsonObject.getDouble("num2");
money = BigDecimal.valueOf(jsonObjectDouble);
}
@@ -813,7 +787,7 @@
newPayment.setOriginalPrice(tCoursePackagePayment.getOriginalPrice());
newPayment.setTotalClassHours(tCoursePackagePayment.getTotalClassHours());
newPayment.setLaveClassHours(tCoursePackagePayment.getTotalClassHours());
- if (request.getUseConpon() == 1){
+ if (request.getUseConpon() == 1) {
newPayment.setUserCouponId(Long.valueOf(request.getUseConpon()));
}
newPayment.setAbsencesNumber(0);
@@ -826,49 +800,49 @@
this.baseMapper.insert(newPayment);
code = newPayment.getCode();
}
- switch (request.getPayType()){
+ switch (request.getPayType()) {
case 1:
- if (request.getUseConpon() == 1){
+ if (request.getUseConpon() == 1) {
Coupon coupon = client.queryCouponById(request.getConponId());
- if (coupon.getType() == 1){
+ if (coupon.getType() == 1) {
Map<String, Object> couponRules = client.getCouponRules(coupon.getId());
Double conditionalAmount = (Double) couponRules.get("conditionalAmount");
Double deductionAmount = (Double) couponRules.get("deductionAmount");
- if (money.compareTo(BigDecimal.valueOf(conditionalAmount)) >= 0){
+ if (money.compareTo(BigDecimal.valueOf(conditionalAmount)) >= 0) {
money = BigDecimal.valueOf(deductionAmount);
}
}
- if (coupon.getType() == 2){
+ if (coupon.getType() == 2) {
Map<String, Object> couponRules = client.getCouponRules(coupon.getId());
Object amount = couponRules.get("deductionAmount");
money = BigDecimal.valueOf((Double) amount);
}
}
try {
- return WeChatPayment(code,money);
- }catch (Exception e){
+ return WeChatPayment(code, money);
+ } catch (Exception e) {
return ResultUtil.runErr();
}
case 2:
- if (request.getUseConpon() == 1){
+ if (request.getUseConpon() == 1) {
Coupon coupon = client.queryCouponById(request.getConponId());
- if (coupon.getType() == 1){
+ if (coupon.getType() == 1) {
Map<String, Object> couponRules = client.getCouponRules(coupon.getId());
Double conditionalAmount = (Double) couponRules.get("conditionalAmount");
Double deductionAmount = (Double) couponRules.get("deductionAmount");
- if (money.compareTo(BigDecimal.valueOf(conditionalAmount)) >= 0){
+ if (money.compareTo(BigDecimal.valueOf(conditionalAmount)) >= 0) {
money = BigDecimal.valueOf(deductionAmount);
}
}
- if (coupon.getType() == 2){
+ if (coupon.getType() == 2) {
Map<String, Object> couponRules = client.getCouponRules(coupon.getId());
Object amount = couponRules.get("deductionAmount");
money = BigDecimal.valueOf((Double) amount);
}
}
- return AlipayPayment(code,money);
+ return AlipayPayment(code, money);
case 3:
- PlaypaiGoldPayment(userIdFormRedis,code,wpGold);
+ PlaypaiGoldPayment(userIdFormRedis, code, wpGold);
break;
default:
break;
@@ -881,23 +855,23 @@
TCoursePackagePaymentMapper baseMapper1 = this.baseMapper;
ResultUtil weixinpay = payMoneyUtil.weixinpay("课包续费", "", code, request.toString(),
"/base/coursePackage/wechatRegisteredCoursesCallback", "APP", "");
- if(weixinpay.getCode() == 200){
+ if (weixinpay.getCode() == 200) {
new Thread(new Runnable() {
@Override
public void run() {
try {
int num = 1;
int wait = 0;
- while (num <= 10){
+ while (num <= 10) {
int min = 5000;
wait += (min * num);
Thread.sleep(wait);
TCoursePackagePayment coursePackagePayment = baseMapper1.getCoursePackagePaymentByCode(code);
- if(coursePackagePayment.getPayStatus() == 2){
+ if (coursePackagePayment.getPayStatus() == 2) {
break;
}
ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(code, "");
- if(resultUtil.getCode() == 200 && coursePackagePayment.getPayStatus() == 1){
+ if (resultUtil.getCode() == 200 && coursePackagePayment.getPayStatus() == 1) {
/**
* SUCCESS—支付成功，
* REFUND—转入退款，
@@ -910,23 +884,23 @@
Map<String, String> data1 = resultUtil.getData();
String s = data1.get("trade_state");
String transaction_id = data1.get("transaction_id");
- if("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10){
+ if ("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
coursePackagePayment.setState(3);
baseMapper1.deleteById(coursePackagePayment.getId());
break;
}
- if("SUCCESS".equals(s)){
+ if ("SUCCESS".equals(s)) {
coursePackagePayment.setPayStatus(2);
coursePackagePayment.setOrderNumber(transaction_id);
baseMapper1.updateById(coursePackagePayment);
break;
}
- if("USERPAYING".equals(s)){
+ if ("USERPAYING".equals(s)) {
num++;
}
}
}
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -936,29 +910,28 @@
}
-
- public ResultUtil AlipayPayment(String code, BigDecimal request){
+ public ResultUtil AlipayPayment(String code, BigDecimal request) {
TCoursePackagePaymentMapper baseMapper1 = this.baseMapper;
ResultUtil alipay = payMoneyUtil.alipay("课包购买", "课包购买", "", code, request.toString(),
"/base/coursePackage/alipayRegisteredCoursesCallback");
- if(alipay.getCode() == 200){
+ if (alipay.getCode() == 200) {
new Thread(new Runnable() {
@Override
public void run() {
try {
int num = 1;
int wait = 0;
- while (num <= 10){
+ while (num <= 10) {
int min = 5000;
wait += (min * num);
Thread.sleep(wait);
TCoursePackagePayment coursePackagePayment = baseMapper1.getCoursePackagePaymentByCode(code);
- if(coursePackagePayment.getPayStatus() == 2){
+ if (coursePackagePayment.getPayStatus() == 2) {
break;
}
AlipayTradeQueryResponse alipayTradeQueryResponse = payMoneyUtil.queryALIOrder(code);
- if(coursePackagePayment.getPayStatus() == 1){
+ if (coursePackagePayment.getPayStatus() == 1) {
/**
* WAIT_BUYER_PAY（交易创建，等待买家付款）、
* TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
@@ -968,23 +941,23 @@
// Map<String, String> data1 = resultUtil.getData();
String s = alipayTradeQueryResponse.getTradeStatus();
String tradeNo = alipayTradeQueryResponse.getTradeNo();
- if("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10){
+ if ("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10) {
coursePackagePayment.setState(3);
baseMapper1.deleteById(coursePackagePayment.getId());
break;
}
- if("TRADE_SUCCESS".equals(s)){
+ if ("TRADE_SUCCESS".equals(s)) {
coursePackagePayment.setPayStatus(2);
coursePackagePayment.setOrderNumber(tradeNo);
baseMapper1.updateById(coursePackagePayment);
break;
}
- if("WAIT_BUYER_PAY".equals(s)){
+ if ("WAIT_BUYER_PAY".equals(s)) {
num++;
}
}
}
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -993,10 +966,10 @@
return alipay;
}
- public ResultUtil PlaypaiGoldPayment(AppUser appUser,String code, Integer wpGold){
+ public ResultUtil PlaypaiGoldPayment(AppUser appUser, String code, Integer wpGold) {
TCoursePackagePayment packagePayment = this.baseMapper.selectOne(new QueryWrapper<TCoursePackagePayment>()
- .eq("code",code ));
- if (appUser.getPlayPaiCoins() < wpGold){
+ .eq("code", code));
+ if (appUser.getPlayPaiCoins() < wpGold) {
return ResultUtil.error("玩牌币不足！");
}
packagePayment.setPayStatus(2);
@@ -1004,21 +977,20 @@
packagePayment.setPlayPaiCoin(wpGold);
this.baseMapper.updateById(packagePayment);
- appUser.setPlayPaiCoins(ToolUtil.isNotEmpty(appUser.getPlayPaiCoins()) ? appUser.getPlayPaiCoins()-wpGold : wpGold);
+ appUser.setPlayPaiCoins(ToolUtil.isNotEmpty(appUser.getPlayPaiCoins()) ? appUser.getPlayPaiCoins() - wpGold : wpGold);
appuClient.updateAppUser(appUser);
return ResultUtil.success();
}
-
@Override
- public List<RecordAppoint> obtainStuClassDetails(Integer stuId, Integer appUserId,Integer pageNum) {
+ public List<RecordAppoint> obtainStuClassDetails(Integer stuId, Integer appUserId, Integer pageNum) {
List<RecordAppoint> recordVoList = new ArrayList<>();
List<TCoursePackagePayment> tCoursePackagePayments = this.baseMapper.selectList(new QueryWrapper<TCoursePackagePayment>()
- .eq("studentId",stuId )
- .eq("appUserId",appUserId )
- .eq("payStatus",2 )
- .eq("status",1 )
+ .eq("studentId", stuId)
+ .eq("appUserId", appUserId)
+ .eq("payStatus", 2)
+ .eq("status", 1)
.orderByDesc("insertTime"));
List<Integer> ids = new ArrayList<>();
@@ -1027,7 +999,7 @@
}
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy.MM.dd");
SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
- if (tCoursePackagePayments.size() > 0 ){
+ if (tCoursePackagePayments.size() > 0) {
// int pageNum = 1; // 页码
int pageSize = 10; // 每页记录数
@@ -1047,133 +1019,133 @@
List<CoursePackageStudent> coursePackageStudent1 = coursePackageStudentPage.getRecords();
- if (ToolUtil.isNotEmpty(coursePackageStudent1) && coursePackageStudent1.size() > 0){
- TCoursePackage coursePackage = new TCoursePackage();
- Integer coursePackageId = -1;
- for (CoursePackageStudent coursePackageStudent : coursePackageStudent1) {
- RecordAppoint recordVo = new RecordAppoint();
- recordVo.setCoursePackageId(coursePackageStudent.getCoursePackageId());
+ if (ToolUtil.isNotEmpty(coursePackageStudent1) && coursePackageStudent1.size() > 0) {
+ TCoursePackage coursePackage = new TCoursePackage();
+ Integer coursePackageId = -1;
+ for (CoursePackageStudent coursePackageStudent : coursePackageStudent1) {
+ RecordAppoint recordVo = new RecordAppoint();
+ recordVo.setCoursePackageId(coursePackageStudent.getCoursePackageId());
- if (!coursePackageStudent.getCoursePackageId().equals(coursePackageId)) {
- coursePackage = tcpmapper.selectById(coursePackageStudent.getCoursePackageId());
- coursePackageId = coursePackageStudent.getCoursePackageId();
+ if (!coursePackageStudent.getCoursePackageId().equals(coursePackageId)) {
+ coursePackage = tcpmapper.selectById(coursePackageStudent.getCoursePackageId());
+ coursePackageId = coursePackageStudent.getCoursePackageId();
+ }
+
+ recordVo.setSid(Arrays.asList(coursePackage.getStoreId()));
+ List<Integer> rid = stoClient.querySiteId(coursePackage.getStoreId());
+ recordVo.setRid(rid);
+ recordVo.setUserId(appUserId);
+ recordVo.setSiteId(coursePackage.getSiteId());
+ List<Integer> ids1 = getIds(coursePackage.getSiteId());
+ recordVo.setIds(ids1);
+
+ recordVo.setCoursePackageName(coursePackage.getName());
+ for (TCoursePackagePayment tCoursePackagePayment : tCoursePackagePayments) {
+ if (Objects.equals(coursePackageStudent.getCoursePackageId(), tCoursePackagePayment.getCoursePackageId())) {
+ recordVo.setCourseHours(tCoursePackagePayment.getClassHours());
+
}
-
- recordVo.setSid(Arrays.asList(coursePackage.getStoreId()));
- List<Integer> rid = stoClient.querySiteId(coursePackage.getStoreId());
- recordVo.setRid(rid);
- recordVo.setUserId(appUserId);
- recordVo.setSiteId(coursePackage.getSiteId());
- List<Integer> ids1 = getIds(coursePackage.getSiteId());
- recordVo.setIds(ids1);
-
- recordVo.setCoursePackageName(coursePackage.getName());
- for (TCoursePackagePayment tCoursePackagePayment : tCoursePackagePayments) {
- if (Objects.equals(coursePackageStudent.getCoursePackageId(), tCoursePackagePayment.getCoursePackageId())){
- recordVo.setCourseHours(tCoursePackagePayment.getClassHours());
-
- }
- }
+ }
// recordVo.setCourseHours(tCoursePackagePayment.getClassHours());
- Date date = DateUtil.getDate();
+ Date date = DateUtil.getDate();
- CoursePackageScheduling byId = coursePackageSchedulingService.getById(coursePackageStudent.getCoursePackageSchedulingId());
+ CoursePackageScheduling byId = coursePackageSchedulingService.getById(coursePackageStudent.getCoursePackageSchedulingId());
// String classStartTime = coursePackage.getClassStartTime();
// String classEndTime = coursePackage.getClassEndTime();
- //这里是过滤今天之后的数据
+ //这里是过滤今天之后的数据
// if (byId == null||byId.getClassDate().after(new Date())){
// continue;
// }
- if (byId == null){
- continue;
- }
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String dateString1 = sdf.format(byId.getClassDate());
- String dateString2 = sdf.format(byId.getEndDate());
+ if (byId == null) {
+ continue;
+ }
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String dateString1 = sdf.format(byId.getClassDate());
+ String dateString2 = sdf.format(byId.getEndDate());
- recordVo.setTimeFrame(dateString1 + "-" + dateString2.substring(11));
+ recordVo.setTimeFrame(dateString1 + "-" + dateString2.substring(11));
// recordVo.setTimeFrame(simpleDateFormat.format(date)+" "+classStartTime+"-"+classEndTime);
- Store store = stoClient.queryStoreById(coursePackage.getStoreId());
- recordVo.setStoreNameAddr(store.getName()+store.getAddress());
- recordVo.setCourseStuRecordId(coursePackageStudent.getId());
- String classWeeks = coursePackage.getClassWeeks();
- String[] split = classWeeks.split(";");
- List<String> integerList = Arrays.asList(split);
- String weekOfDate = DateTimeHelper.getWeekOfDate(new Date());
- if (integerList.contains(weekOfDate)){
- String dat = simpleDateFormat.format(byId.getClassDate()) +" "+ dateString1.substring(11);
+ Store store = stoClient.queryStoreById(coursePackage.getStoreId());
+ recordVo.setStoreNameAddr(store.getName() + store.getAddress());
+ recordVo.setCourseStuRecordId(coursePackageStudent.getId());
+ String classWeeks = coursePackage.getClassWeeks();
+ String[] split = classWeeks.split(";");
+ List<String> integerList = Arrays.asList(split);
+ String weekOfDate = DateTimeHelper.getWeekOfDate(new Date());
+ if (integerList.contains(weekOfDate)) {
+ String dat = simpleDateFormat.format(byId.getClassDate()) + " " + dateString1.substring(11);
- Date start = null;
- try {
- start = format.parse(dat);
- } catch (ParseException e) {
- throw new RuntimeException(e);
- }
- //已取消
- if (byId.getStatus()==4){
- recordVo.setStatus(4);
- } else if(coursePackageStudent.getSignInOrNot()==2){
- //已请假
- recordVo.setStatus(5);
- }
- else if (start.after(new Date())){
- //待上课
- recordVo.setStatus(1);
- }
+ Date start = null;
+ try {
+ start = format.parse(dat);
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+ //已取消
+ if (byId.getStatus() == 4) {
+ recordVo.setStatus(4);
+ } else if (coursePackageStudent.getSignInOrNot() == 2) {
+ //已请假
+ recordVo.setStatus(5);
+ } else if (start.after(new Date())) {
+ //待上课
+ recordVo.setStatus(1);
+ }
// else if(coursePackageStudent.getSignInOrNot()==2){
// recordVo.setStatus(5);
// }
- else {
+ else {
// CancelledClasses cancelledClasses = cacMapper.selectOne(new QueryWrapper<CancelledClasses>()
// .eq("coursePackageId",coursePackageStudent.getCoursePackageId()));
- CancelledClasses cancelledClasses = cacMapper.selectOne(new QueryWrapper<CancelledClasses>()
- .eq("coursePackageSchedulingId",byId.getId()).last("limit 1"));
- if (ToolUtil.isNotEmpty(cancelledClasses)){
+ CancelledClasses cancelledClasses = cacMapper.selectOne(new QueryWrapper<CancelledClasses>()
+ .eq("coursePackageSchedulingId", byId.getId()).last("limit 1"));
+ if (ToolUtil.isNotEmpty(cancelledClasses)) {
+ recordVo.setStatus(3);
+ // 消课 到课状态0 旷课
+ if (coursePackageStudent.getSignInOrNot() == 0) {
+ recordVo.setStatus(6);
+ }
+
+ } else {
+ Date now = new Date();
+ if (now.after(byId.getClassDate()) && now.before(byId.getEndDate())) {
+ recordVo.setStatus(2);
+ } else {
recordVo.setStatus(3);
- // 消课 到课状态0 旷课
- if(coursePackageStudent.getSignInOrNot()==0){
- recordVo.setStatus(6);
- }
- }else {
- Date now = new Date();
- if (now.after(byId.getClassDate())&&now.before(byId.getEndDate())){
- recordVo.setStatus(2);
- }else {
- recordVo.setStatus(3);
-
- }
}
}
- }else {
- recordVo.setStatus(1);
}
- recordVoList.add(recordVo);
+ } else {
+ recordVo.setStatus(1);
}
-
- }else {
-// recordVo.setStatus(4);
+ recordVoList.add(recordVo);
}
+ } else {
+// recordVo.setStatus(4);
}
+
+ }
// }
return recordVoList;
}
- public List<Integer> getIds(Integer siteId) {
+
+ public List<Integer> getIds(Integer siteId) {
HttpRequest httpRequest = HttpRequest.get("https://try.daowepark.com/v7/user_api/general/get_space_area?space_id=" + siteId);
HttpResponse execute = httpRequest.execute();
String body = execute.body();
JSONObject jsonObject = JSONObject.parseObject(body);
Object data = jsonObject.get("data");
JSONArray array = JSONArray.parseArray(data.toString());
- List<Integer> ids =new ArrayList<>();
+ List<Integer> ids = new ArrayList<>();
for (Object o : array) {
JSONObject jsonObject1 = JSONObject.parseObject(o.toString());
Object id = jsonObject1.get("id");
@@ -1183,10 +1155,11 @@
return ids;
}
+
@Override
public ResultUtil insertVipPaymentCallback(String code, String orderNumber) {
TCoursePackagePayment coursePackagePayment = this.baseMapper.getCoursePackagePaymentByCode(code);
- if(coursePackagePayment.getPayStatus() != 1){
+ if (coursePackagePayment.getPayStatus() != 1) {
return ResultUtil.success();
}
coursePackagePayment.setPayStatus(2);
@@ -1197,12 +1170,13 @@
@Override
public List<BillingRequest> queryAmountDatas(Integer appUserId, String monthStart, String monthEnd) {
- return this.baseMapper.billingDataRequestVo(appUserId,monthStart,monthEnd);
+ return this.baseMapper.billingDataRequestVo(appUserId, monthStart, monthEnd);
}
/**
* 获取课包报名信息
+ *
* @param page
* @param queryRegistrationRecord
* @return
@@ -1213,16 +1187,16 @@
String userName = queryRegistrationRecord.getUserName();
List<Integer> userIds = null;
List<Integer> studentIds = null;
- if(ToolUtil.isNotEmpty(userName)){
+ if (ToolUtil.isNotEmpty(userName)) {
List<AppUser> appUsers = appuClient.queryAppUserListByName(userName);
- if(appUsers.size() > 0){
+ if (appUsers.size() > 0) {
userIds = appUsers.stream().map(AppUser::getId).collect(Collectors.toList());
}
}
String studentName = queryRegistrationRecord.getStudentName();
- if(ToolUtil.isNotEmpty(studentName)){
+ if (ToolUtil.isNotEmpty(studentName)) {
List<Student> students = studentClient.queryStudentListByName(studentName);
- if(students.size() > 0){
+ if (students.size() > 0) {
studentIds = students.stream().map(Student::getId).collect(Collectors.toList());
}
}
@@ -1252,6 +1226,7 @@
/**
* 获取未预约排课学员列表
+ *
* @param page
* @param queryWalkInStudentList
* @return
@@ -1263,22 +1238,22 @@
String userName = queryWalkInStudentList.getUserName();
List<Integer> userIds = null;
List<Integer> studentIds = null;
- if(ToolUtil.isNotEmpty(userName)){
+ if (ToolUtil.isNotEmpty(userName)) {
List<AppUser> appUsers = appuClient.queryAppUserListByName(userName);
- if(appUsers.size() > 0){
+ if (appUsers.size() > 0) {
userIds = appUsers.stream().map(AppUser::getId).collect(Collectors.toList());
}
}
String studentName = queryWalkInStudentList.getStudentName();
- if(ToolUtil.isNotEmpty(studentName)){
+ if (ToolUtil.isNotEmpty(studentName)) {
List<Student> students = studentClient.queryStudentListByName(studentName);
- if(students.size() > 0){
+ if (students.size() > 0) {
studentIds = students.stream().map(Student::getId).collect(Collectors.toList());
}
}
List<Long> coursePackagePaymentId = null;
List<CoursePackageStudent> coursePackageStudents = cpsMapper.selectList(new QueryWrapper<CoursePackageStudent>().eq("coursePackageSchedulingId", coursePackageSchedulingId).eq("reservationStatus", 1));
- if(coursePackageStudents.size() > 0){
+ if (coursePackageStudents.size() > 0) {
coursePackagePaymentId = coursePackageStudents.stream().map(CoursePackageStudent::getCoursePackagePaymentId).collect(Collectors.toList());
}
@@ -1306,10 +1281,10 @@
ArrayList<PayCourseRes> payCourseRes = new ArrayList<>();
for (TCoursePackagePayment tCoursePackagePayment : tCoursePackagePayments) {
TCoursePackage tCoursePackage = tcpmapper.selectById(tCoursePackagePayment.getCoursePackageId());
- if (tCoursePackage.getType()!=1){
+ if (tCoursePackage.getType() != 1) {
continue;
}
- if(tCoursePackage.getStoreId().equals(storeId)){
+ if (tCoursePackage.getStoreId().equals(storeId)) {
PayCourseRes payCourseRes1 = new PayCourseRes();
payCourseRes1.setId(tCoursePackagePayment.getId());
payCourseRes1.setName(tCoursePackage.getName());
@@ -1322,7 +1297,7 @@
}
@Override
- public PayCourseInfoReq payCourseInfo(Integer courseId){
+ public PayCourseInfoReq payCourseInfo(Integer courseId) {
PayCourseInfoReq payCourseInfoReq = new PayCourseInfoReq();
TCoursePackage tCoursePackage = tcpmapper.selectById(courseId);
payCourseInfoReq.setId(courseId);
@@ -1342,27 +1317,27 @@
List<Integer> week = week(tCoursePackage.getClassWeeks());
// 今天周几
- int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date()) - 1;
SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd");
ArrayList<String> strings1 = new ArrayList<>();
for (Integer integer : week) {
- if(integer<i){
+ if (integer < i) {
// 找下一周的时间
Calendar instance = Calendar.getInstance();
- instance.add(Calendar.DATE,7-(i-integer));
+ instance.add(Calendar.DATE, 7 - (i - integer));
Date time = instance.getTime();
strings1.add(format.format(time));
- }else if(integer>i) {
+ } else if (integer > i) {
Calendar instance = Calendar.getInstance();
- instance.add(Calendar.DATE,integer-i);
+ instance.add(Calendar.DATE, integer - i);
Date time = instance.getTime();
strings1.add(format.format(time));
- }else {
+ } else {
Calendar instance = Calendar.getInstance();
- instance.add(Calendar.DATE,7);
+ instance.add(Calendar.DATE, 7);
Date time = instance.getTime();
strings1.add(format.format(time));
}
@@ -1370,11 +1345,12 @@
payCourseInfoReq.setDay(strings1);
return payCourseInfoReq;
}
- private static List<Integer> week(String week){
+
+ private static List<Integer> week(String week) {
String[] split = week.split(";");
ArrayList<Integer> integers = new ArrayList<>();
for (String s : split) {
- switch (s){
+ switch (s) {
case "周一":
integers.add(1);
break;
@@ -1411,28 +1387,28 @@
private CoursePackageStudentService coursePackageStudentService;
@Autowired
- private CourseCounsumService courseCounsumService;
+ private CourseCounsumService courseCounsumService;
@Override
- @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRES_NEW)
- public ResultUtil payCourse(PayCourseReq req,Integer userId) throws ParseException {
+ @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
+ public ResultUtil payCourse(PayCourseReq req, Integer userId) throws ParseException {
// 扣除 原来的课时数
// 添加购买课时 paytyoe为7
// 排课可期 判断课程时间段 添加排课表 添加上课记录表
// 找到原来的课包 扣课时
TCoursePackagePayment tCoursePackagePayment = this.baseMapper.selectById(req.getOldCourseId());
- if(req.getNum()>tCoursePackagePayment.getLaveClassHours()){
+ if (req.getNum() > tCoursePackagePayment.getLaveClassHours()) {
return ResultUtil.error("当前课包课时数不足");
}
- tCoursePackagePayment.setLaveClassHours(tCoursePackagePayment.getLaveClassHours()-req.getNum());
- this.baseMapper.updateHoursById(tCoursePackagePayment.getId(),-req.getNum());
+ tCoursePackagePayment.setLaveClassHours(tCoursePackagePayment.getLaveClassHours() - req.getNum());
+ this.baseMapper.updateHoursById(tCoursePackagePayment.getId(), -req.getNum());
List<CoursePackageStudent> studentCourse = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", tCoursePackagePayment.getStudentId()).eq("coursePackageId", tCoursePackagePayment.getCoursePackageId()));
List<Long> collect = studentCourse.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());
List<CoursePackageScheduling> list = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>().in("id", collect).le("classDate", new Date()));
- coursePackageSchedulingService.remove(new QueryWrapper<CoursePackageScheduling>().in("id",collect).le("classDate", new Date()));
+ coursePackageSchedulingService.remove(new QueryWrapper<CoursePackageScheduling>().in("id", collect).le("classDate", new Date()));
List<Long> collect1 = list.stream().map(CoursePackageScheduling::getId).collect(Collectors.toList());
@@ -1453,7 +1429,7 @@
Integer laveClassHours = pay.getLaveClassHours();
Integer codeTime = tCoursePackage.getCodeTime();
- Integer can = laveClassHours/codeTime;
+ Integer can = laveClassHours / codeTime;
int count = 0;
String[] split = tCoursePackage.getClassStartTime().split(",");
@@ -1461,15 +1437,15 @@
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- Date[] dates = generateDateArray(14,today);
+ Date[] dates = generateDateArray(14, today);
for (Date date : dates) {
- if (count==can){
+ if (count == can) {
break;
}
- int wei = cn.hutool.core.date.DateUtil.dayOfWeek(date);
- if (week.contains(wei)){
+ int wei = cn.hutool.core.date.DateUtil.dayOfWeek(date);
+ if (week.contains(wei)) {
for (int i1 = 0; i1 < split.length; i1++) {
- if (count==can){
+ if (count == can) {
break;
}
CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
@@ -1494,8 +1470,6 @@
}
}
}
-
-
// TCoursePackage tCoursePackage = tcpmapper.selectById(req.getCourseId());
@@ -1584,8 +1558,7 @@
courseCounsumService.save(courseCounsum);
-
- if(tCoursePackagePayment.getLaveClassHours()<=3){
+ if (tCoursePackagePayment.getLaveClassHours() <= 3) {
Integer appUserId = userId;
//调用推送
@@ -1594,9 +1567,9 @@
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
String s1 = appUserId + "_" + "Three";
//定时修改排课状态
- String s = internalRestTemplate.getForObject("http://mb-cloud-gateway/netty/sendMsgToClient?id="+s1, String.class);
+ 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){
+ if (jsonObject1.getIntValue("code") != 200) {
System.err.println(jsonObject1.getString("msg"));
}
}
@@ -1607,22 +1580,21 @@
@Override
public void updateUseTime(Long id, Date date) {
- this.baseMapper.updateUseTime(id,date);
+ this.baseMapper.updateUseTime(id, date);
}
@Override
public List<Integer> getStudentIds(Long payId, Integer classId, Integer appId) {
- return this.baseMapper.getStudentIds(payId,classId,appId);
+ return this.baseMapper.getStudentIds(payId, classId, appId);
}
@Override
public boolean updateHoursById(TCoursePackagePayment byId, int i) {
- return this.baseMapper.updateHoursById1(byId.getId(),i);
+ return this.baseMapper.updateHoursById1(byId.getId(), i);
}
-
- public static Date[] generateDateArray(int numDays,Date date) {
+ public static Date[] generateDateArray(int numDays, Date date) {
// LocalDate tomorrow = LocalDate.now().plusDays(1);
LocalDate tomorrow = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().plusDays(1);
--
Gitblit v1.7.1