From c036557db88c6297b9a626a892dce35c14ab8ee5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 09 十一月 2023 18:30:31 +0800
Subject: [PATCH] 11.6
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 759 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 575 insertions(+), 184 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
index 77735e7..7641115 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -1,5 +1,6 @@
package com.dsh.course.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -9,7 +10,10 @@
import com.alipay.api.DefaultAlipayClient;
import com.alipay.api.domain.*;
import com.alipay.api.request.AlipayTradeOrderSettleRequest;
+import com.alipay.api.request.AlipayTradeRoyaltyRelationBindRequest;
import com.alipay.api.response.AlipayTradeOrderSettleResponse;
+import com.alipay.api.response.AlipayTradeQueryResponse;
+import com.alipay.api.response.AlipayTradeRoyaltyRelationBindResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -32,6 +36,7 @@
import com.dsh.course.model.*;
import com.dsh.course.service.*;
import com.dsh.course.util.*;
+import io.vertx.core.json.Json;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -39,6 +44,9 @@
import java.math.RoundingMode;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.Period;
+import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;
@@ -119,8 +127,11 @@
Map<String, String> geocode = gdMapGeocodingUtil.geocode(coursePackageList.getLon(), coursePackageList.getLat());
String provinceCode = geocode.get("provinceCode");
String cityCode = geocode.get("cityCode");
+// QueryWrapper<TCoursePackage> wrapper = new QueryWrapper<TCoursePackage>().in("status", Arrays.asList(1, 2))
+// .eq("auditStatus", 2).eq("state", 1).eq("provinceCode", provinceCode).eq("cityCode", cityCode);
+
QueryWrapper<TCoursePackage> wrapper = new QueryWrapper<TCoursePackage>().in("status", Arrays.asList(1, 2))
- .eq("auditStatus", 2).eq("state", 1).eq("provinceCode", provinceCode).eq("cityCode", cityCode);
+ .eq("auditStatus", 2).eq("state", 1);
if(null != coursePackageList.getCoursePackageTypeId()){
wrapper.eq("coursePackageTypeId", coursePackageList.getCoursePackageTypeId());
}
@@ -135,10 +146,17 @@
List<Store> stores = storeClient.queryStoreListByName(coursePackageList.getSearch());
List<Integer> collect = stores.stream().map(Store::getId).collect(Collectors.toList());
if(collect.size() > 0){
- wrapper.or().in("id", collect);
+ wrapper.or().in("storeId", collect);
}
}
- List<TCoursePackage> list = this.list(wrapper.last(" order by sort, insertTime desc"));
+ List<TCoursePackage> list1 = this.list(wrapper.last(" order by sort desc, insertTime desc"));
+ Date currentTime = new Date();
+
+// Filter the list based on the conditions
+ List<TCoursePackage> list = list1.stream()
+ .filter(coursePackage -> coursePackage.getType() != 2 || currentTime.before(coursePackage.getEndTime()))
+ .collect(Collectors.toList());
+
List<CoursePackageListVo> listVos = new ArrayList<>();
for (TCoursePackage coursePackage : list) {
Store store = storeClient.queryStoreById(coursePackage.getStoreId());
@@ -169,13 +187,25 @@
coursePackageListVo.setApplicantsNumber(integer);
- coursePackageListVo.setPayType(coursePackage.getPayType());
- coursePackageListVo.setPlayPaiCoin(coursePackagePaymentConfig.getPlayPaiCoin());
+ Double cashPayment1 = coursePackagePaymentConfig.getCashPayment();
+ Integer playPaiCoin = coursePackagePaymentConfig.getPlayPaiCoin();
+ if(ToolUtil.isNotEmpty(cashPayment1) && cashPayment1>0 && ToolUtil.isNotEmpty(playPaiCoin) && playPaiCoin>0){
+ coursePackageListVo.setPayType(3);
+ }else if(ToolUtil.isNotEmpty(cashPayment1) && cashPayment1>0){
+ coursePackageListVo.setPayType(1);
+ }else if(ToolUtil.isNotEmpty(playPaiCoin) && playPaiCoin>0){
+ coursePackageListVo.setPayType(2);
+ }
+
+
+ if (coursePackagePaymentConfig!=null) {
+ coursePackageListVo.setPlayPaiCoin(coursePackagePaymentConfig.getPlayPaiCoin());
+ }
//会员显示原价和会员价（最低）。非会员显示会员价和支付价（最低）
if(appUser.getIsVip() == 0){//非会员
List<TCoursePackageDiscount> list2 = coursePackageDiscountService.list(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", coursePackagePaymentConfig.getId())
- .eq("type", 1).eq("auditStatus", 2));
+ .eq("type", 1).eq("auditStatus", 2).eq("status",1));
Double vipPrice = coursePackagePaymentConfig.getCashPayment();
for (TCoursePackageDiscount coursePackageDiscount : list2) {
Double num1 = JSON.parseObject(coursePackageDiscount.getContent()).getDouble("discountMember");
@@ -187,7 +217,7 @@
Double paymentPrice = coursePackagePaymentConfig.getCashPayment();
List<TCoursePackageDiscount> list3 = coursePackageDiscountService.list(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", coursePackagePaymentConfig.getId())
- .eq("type", 3).eq("auditStatus", 2));
+ .eq("type", 3).eq("auditStatus", 2).eq("status",1));
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
for (TCoursePackageDiscount coursePackageDiscount : list3) {
/**
@@ -264,7 +294,7 @@
coursePackageListVo.setPaymentPrice(paymentPrice);
}else{
List<TCoursePackageDiscount> list2 = coursePackageDiscountService.list(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", coursePackagePaymentConfig.getId())
- .eq("type", 1).eq("auditStatus", 2));
+ .eq("type", 1).eq("auditStatus", 2).eq("status",1));
Double vipPrice = coursePackagePaymentConfig.getCashPayment();
for (TCoursePackageDiscount coursePackageDiscount : list2) {
Double num1 = JSON.parseObject(coursePackageDiscount.getContent()).getDouble("discountMember");
@@ -282,21 +312,41 @@
}
//销量排行
- if(ToolUtil.isNotEmpty(coursePackageList.getSalesRanking())){
+ if(ToolUtil.isNotEmpty(coursePackageList.getSalesRanking())&&coursePackageList.getSalesRanking().equals("asc")){
Collections.sort(listVos, new Comparator<CoursePackageListVo>() {
public int compare(CoursePackageListVo s1, CoursePackageListVo s2) {
return Integer.compare(s1.getApplicantsNumber(), s2.getApplicantsNumber());
}
});
}
+
+
+ if(ToolUtil.isNotEmpty(coursePackageList.getSalesRanking())&&coursePackageList.getSalesRanking().equals("desc")){
+ Collections.sort(listVos, new Comparator<CoursePackageListVo>() {
+ public int compare(CoursePackageListVo s1, CoursePackageListVo s2) {
+ return Integer.compare(s2.getApplicantsNumber(), s1.getApplicantsNumber());
+ }
+ });
+ }
+
+
//距离排行
- if(ToolUtil.isNotEmpty(coursePackageList.getDistanceSort())){
+ if(ToolUtil.isNotEmpty(coursePackageList.getDistanceSort())&&coursePackageList.getDistanceSort().equals("asc")){
Collections.sort(listVos, new Comparator<CoursePackageListVo>() {
public int compare(CoursePackageListVo s1, CoursePackageListVo s2) {
return Double.compare(s1.getDistance(), s2.getDistance());
}
});
}
+ if (ToolUtil.isNotEmpty(coursePackageList.getDistanceSort())&&coursePackageList.getDistanceSort().equals("desc")) {
+ Collections.sort(listVos, new Comparator<CoursePackageListVo>() {
+ public int compare(CoursePackageListVo s1, CoursePackageListVo s2) {
+ return Double.compare(s2.getDistance(), s1.getDistance());
+ }
+ });
+ }
+
+
return listVos;
}
@@ -338,7 +388,18 @@
coursePackageListVo.setId(coursePackage.getId());
coursePackageListVo.setName(coursePackage.getName());
coursePackageListVo.setStoreName(null != store ? store.getName() : "");
+// coursePackageListVo.setPayType();
coursePackageListVo.setCoverDrawing(coursePackage.getCoverDrawing());
+
+ Double cashPayment1 = coursePackagePaymentConfig.getCashPayment();
+ Integer playPaiCoin = coursePackagePaymentConfig.getPlayPaiCoin();
+ if(ToolUtil.isNotEmpty(cashPayment1) && cashPayment1>0 && ToolUtil.isNotEmpty(playPaiCoin) && playPaiCoin>0){
+ coursePackageListVo.setPayType(3);
+ }else if(ToolUtil.isNotEmpty(cashPayment1) && cashPayment1>0){
+ coursePackageListVo.setPayType(1);
+ }else if(ToolUtil.isNotEmpty(playPaiCoin) && playPaiCoin>0){
+ coursePackageListVo.setPayType(2);
+ }
// 2.0修改
String classStartTime = coursePackage.getClassStartTime();
@@ -508,6 +569,7 @@
coursePackageInfo.setTime(format.format(coursePackage.getStartTime())+"-"+format.format(coursePackage.getEndTime()));
}
coursePackageInfo.setCoverDrawing(coursePackage.getCoverDrawing());
+
coursePackageInfo.setName(coursePackage.getName());
Store store = storeClient.queryStoreById(coursePackage.getStoreId());
coursePackageInfo.setStoreName(store.getName());
@@ -548,8 +610,17 @@
CoursePackagePaymentConfigVo coursePackagePaymentConfigVo = new CoursePackagePaymentConfigVo();
coursePackagePaymentConfigVo.setId(coursePackagePaymentConfig.getId());
coursePackagePaymentConfigVo.setClassHours(coursePackagePaymentConfig.getClassHours());
- coursePackagePaymentConfigVo.setPayType(coursePackage.getPayType());
coursePackagePaymentConfigVo.setPlayPaiCoin(coursePackagePaymentConfig.getPlayPaiCoin());
+
+ 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){
+ coursePackagePaymentConfigVo.setPayType(1);
+ }else if( ToolUtil.isNotEmpty(coursePackagePaymentConfig.getPlayPaiCoin()) && coursePackagePaymentConfig.getPlayPaiCoin()>0 ){
+ coursePackagePaymentConfigVo.setPayType(2);
+ }
+
+// coursePackagePaymentConfigVo.setPayType(coursePackage.getPayType());
//会员显示原价和支付价（会员价）。非会员显示会员价和支付价（最低）
if(appUser.getIsVip() == 0){//非会员
List<TCoursePackageDiscount> list2 = coursePackageDiscountService.list(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", coursePackagePaymentConfig.getId())
@@ -682,8 +753,13 @@
public ResultUtil paymentCourse(Integer uid, PaymentCourseVo paymentCourseVo) throws Exception {
AppUser appUser = appUserClient.queryAppUser(uid);
CoursePackageInfo coursePackageInfo = queryCourseInfo(uid, paymentCourseVo.getId(), null, null);
+ //校验是否已经报满
+ Integer integer = coursePackagePaymentService.queryCountNumber(paymentCourseVo.getId());
+ TCoursePackage course = coursePackageService.getById(paymentCourseVo.getId());
+ if (integer+paymentCourseVo.getStudentIds().split(";").length>course.getMaxSubscribeNumber()){
+ return ResultUtil.error("报名失败，已达最大报名人数");
+ }
List<CoursePackagePaymentConfigVo> list = coursePackageInfo.getList();
-
String[] students = paymentCourseVo.getStudentIds().split(";");
for (CoursePackagePaymentConfigVo coursePackagePaymentConfigVo : list) {
if(paymentCourseVo.getCoursePackagePaymentConfigId().compareTo(coursePackagePaymentConfigVo.getId()) == 0){
@@ -700,7 +776,6 @@
if((cashPayment!=null || cashPayment>0) &&(playPaiCoin1!=null || playPaiCoin1>0)){
payType=3;
}
-
if(cashPayment!=null && cashPayment>0 && playPaiCoin1 !=null && playPaiCoin1>0){
}else {
if(payType == 1 && paymentCourseVo.getPayType() == 3){//现金支付
@@ -710,12 +785,11 @@
return ResultUtil.error("支付方式错误，请刷新后重试");
}
}
-
Double paymentPrice = coursePackagePaymentConfigVo.getPaymentPrice();//支付价
paymentPrice = new BigDecimal(students.length).multiply(new BigDecimal(paymentPrice)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
Double playPaiCoin = coursePackagePaymentConfigVo.getPlayPaiCoin().doubleValue();//支付币
playPaiCoin = new BigDecimal(students.length).multiply(new BigDecimal(playPaiCoin)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
- if(paymentCourseVo.getPayType() != 3 && paymentPrice.compareTo(paymentCourseVo.getPrice()) != 0){
+ if(paymentCourseVo.getPayType() != 3 && paymentPrice.compareTo(paymentCourseVo.getPrice()) != 0&&paymentCourseVo.getCouponId()!=null){
return ResultUtil.error("支付金额异常，请刷新后重试");
}
if(paymentCourseVo.getPayType() == 3 && playPaiCoin.compareTo(paymentCourseVo.getPrice()) != 0){
@@ -723,9 +797,7 @@
}
}
}
-
Double price = paymentCourseVo.getPrice();//支付金额
-
//校验优惠券
Long couponId = paymentCourseVo.getCouponId();
if(null != couponId && paymentCourseVo.getPayType() != 3){
@@ -811,6 +883,15 @@
coursePackagePayment.setState(1);
coursePackagePayment.setInsertTime(new Date());
coursePackagePaymentService.save(coursePackagePayment);
+
+
+ CourseCounsum courseCounsum = new CourseCounsum();
+ courseCounsum.setPaymentId(coursePackagePayment.getId());
+ courseCounsum.setChangeType(1);
+ courseCounsum.setNum(coursePackagePaymentConfig.getClassHours());
+ courseCounsum.setInsertTime(new Date());
+ courseCounsum.setReason("购买课包");
+ courseCounsumService.save(courseCounsum);
}
Student student = studentClient.queryDefaultStudent(uid);
@@ -866,7 +947,7 @@
// 2.0
userCouponClient.sendUserCoupon(new SendCouponReq(uid,coursePackagePaymentConfig.getCouponIds()));
- addPackageStudent(paymentCourseVo.getId(),uid, finalSid,one.getId());
+ addPackageStudent(paymentCourseVo.getId(),uid, finalSid,one.getId(),null);
break;
}
if("USERPAYING".equals(s)){
@@ -898,26 +979,109 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
for (String s : split) {
- TCoursePackagePayment coursePackagePayment = new TCoursePackagePayment();
- coursePackagePayment.setCode(code);
- coursePackagePayment.setAppUserId(uid);
- coursePackagePayment.setStudentId(Integer.valueOf(s));
- coursePackagePayment.setCoursePackageId(paymentCourseVo.getId());
- coursePackagePayment.setPayType(paymentCourseVo.getPayType());
- coursePackagePayment.setClassHours(coursePackagePaymentConfig.getClassHours());
- coursePackagePayment.setOriginalPrice(paymentCourseVo.getPrice());
- coursePackagePayment.setUserCouponId(paymentCourseVo.getCouponId());
- coursePackagePayment.setCashPayment(new BigDecimal(paymentPrice));
- coursePackagePayment.setTotalClassHours(coursePackagePaymentConfig.getClassHours());
- coursePackagePayment.setLaveClassHours(coursePackagePaymentConfig.getClassHours());
- coursePackagePayment.setAbsencesNumber(0);
- coursePackagePayment.setPayUserType(1);
- coursePackagePayment.setPayStatus(1);
- coursePackagePayment.setPayUserId(uid);
- coursePackagePayment.setStatus(1);
- coursePackagePayment.setState(1);
- coursePackagePayment.setInsertTime(new Date());
- coursePackagePaymentService.save(coursePackagePayment);
+// TCoursePackagePayment coursePackagePayment = new TCoursePackagePayment();
+// coursePackagePayment.setCode(code);
+// coursePackagePayment.setAppUserId(uid);
+// coursePackagePayment.setStudentId(Integer.valueOf(s));
+// coursePackagePayment.setCoursePackageId(paymentCourseVo.getId());
+// coursePackagePayment.setPayType(paymentCourseVo.getPayType());
+// coursePackagePayment.setClassHours(coursePackagePaymentConfig.getClassHours());
+// coursePackagePayment.setOriginalPrice(paymentCourseVo.getPrice());
+// coursePackagePayment.setUserCouponId(paymentCourseVo.getCouponId());
+// coursePackagePayment.setCashPayment(new BigDecimal(paymentPrice));
+// coursePackagePayment.setTotalClassHours(coursePackagePaymentConfig.getClassHours());
+// coursePackagePayment.setLaveClassHours(coursePackagePaymentConfig.getClassHours());
+// coursePackagePayment.setAbsencesNumber(0);
+// coursePackagePayment.setPayUserType(1);
+// coursePackagePayment.setPayStatus(1);
+// coursePackagePayment.setPayUserId(uid);
+// coursePackagePayment.setStatus(1);
+// coursePackagePayment.setState(1);
+// coursePackagePayment.setInsertTime(new Date());
+// coursePackagePaymentService.save(coursePackagePayment);
+//
+//
+// CourseCounsum courseCounsum = new CourseCounsum();
+// courseCounsum.setPaymentId(coursePackagePayment.getId());
+// courseCounsum.setChangeType(1);
+// courseCounsum.setNum(coursePackagePaymentConfig.getClassHours());
+// courseCounsum.setInsertTime(new Date());
+// courseCounsum.setReason("购买课包");
+// courseCounsumService.save(courseCounsum);
+
+ TCoursePackagePayment coursePackagePaymentServiceOne = coursePackagePaymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("studentId", s).eq("coursePackageId", paymentCourseVo.getId()));
+
+ if (coursePackagePaymentServiceOne==null) {
+ TCoursePackagePayment coursePackagePayment = new TCoursePackagePayment();
+ coursePackagePayment.setCode(code);
+ coursePackagePayment.setAppUserId(uid);
+ coursePackagePayment.setStudentId(Integer.valueOf(s));
+ coursePackagePayment.setCoursePackageId(paymentCourseVo.getId());
+ coursePackagePayment.setPayType(paymentCourseVo.getPayType());
+ coursePackagePayment.setClassHours(coursePackagePaymentConfig.getClassHours());
+ coursePackagePayment.setOriginalPrice(paymentCourseVo.getPrice());
+ coursePackagePayment.setPlayPaiCoin(paymentPrice.intValue());
+ coursePackagePayment.setTotalClassHours(coursePackagePaymentConfig.getClassHours());
+ coursePackagePayment.setLaveClassHours(coursePackagePaymentConfig.getClassHours());
+ coursePackagePayment.setAbsencesNumber(0);
+ coursePackagePayment.setPayUserType(1);
+ coursePackagePayment.setPayStatus(1);
+ coursePackagePayment.setPayUserId(uid);
+ coursePackagePayment.setStatus(1);
+ coursePackagePayment.setState(1);
+ coursePackagePayment.setInsertTime(new Date());
+ coursePackagePaymentService.save(coursePackagePayment);
+ Integer sId = null;
+ Student student = studentClient.queryDefaultStudent(uid);
+ if (student != null) {
+ sId = student.getId();
+ }
+
+// coursePackagePaymentServiceOne.setPlayPaiCoin(coursePackagePaymentServiceOne.getPlayPaiCoin()+paymentPrice.intValue());
+
+// addPackageStudent(paymentCourseVo.getId(), uid, Integer.valueOf(s), coursePackagePayment.getId());
+
+ CourseCounsum courseCounsum = new CourseCounsum();
+ courseCounsum.setPaymentId(coursePackagePayment.getId());
+ courseCounsum.setChangeType(1);
+ courseCounsum.setNum(coursePackagePaymentConfig.getClassHours());
+ courseCounsum.setInsertTime(new Date());
+ courseCounsum.setReason("购买课包");
+ courseCounsumService.save(courseCounsum);
+
+ }else {
+ coursePackagePaymentServiceOne.setClassHours(coursePackagePaymentServiceOne.getClassHours()+coursePackagePaymentConfig.getClassHours());
+ coursePackagePaymentServiceOne.setOriginalPrice(coursePackagePaymentServiceOne.getOriginalPrice()+paymentCourseVo.getPrice());
+ coursePackagePaymentServiceOne.setPlayPaiCoin(coursePackagePaymentServiceOne.getPlayPaiCoin()+paymentPrice.intValue());
+ coursePackagePaymentServiceOne.setTotalClassHours(coursePackagePaymentServiceOne.getTotalClassHours()+coursePackagePaymentConfig.getClassHours());
+ coursePackagePaymentServiceOne.setLaveClassHours(coursePackagePaymentServiceOne.getLaveClassHours()+coursePackagePaymentConfig.getClassHours());
+ coursePackagePaymentServiceOne.setCode(code);
+
+ coursePackagePaymentServiceOne.setAppUserId(null);
+ coursePackagePaymentServiceOne.setPayStatus(1);
+ coursePackagePaymentService.updateById(coursePackagePaymentServiceOne);
+
+// coursePackagePaymentService.save(coursePackagePayment);
+ Integer sId = null;
+ Student student = studentClient.queryDefaultStudent(uid);
+ if (student != null) {
+ sId = student.getId();
+ }
+ coursePackagePaymentServiceOne.setPlayPaiCoin(coursePackagePaymentServiceOne.getPlayPaiCoin()+paymentPrice.intValue());
+
+
+// addPackageStudent(paymentCourseVo.getId(), uid, Integer.valueOf(s), coursePackagePaymentServiceOne.getId());
+
+ CourseCounsum courseCounsum = new CourseCounsum();
+ courseCounsum.setPaymentId(coursePackagePaymentServiceOne.getId());
+ courseCounsum.setChangeType(1);
+ courseCounsum.setNum(coursePackagePaymentConfig.getClassHours());
+ courseCounsum.setInsertTime(new Date());
+ courseCounsum.setReason("续课");
+ courseCounsumService.save(courseCounsum);
+
+
+ }
}
Student student = studentClient.queryDefaultStudent(uid);
@@ -926,7 +1090,7 @@
sid=student.getId();
}
- ResultUtil alipay = payMoneyUtil.alipay("购买课程", "购买课程", "", code, paymentPrice.toString(), "/base/course/aliPaymentCourseCallback");
+ ResultUtil alipay = payMoneyUtil.alipay("购买课程", "购买课程", student.getId().toString(), code, paymentPrice.toString(), "/base/course/aliPaymentCourseCallback");
if(alipay.getCode() == 200){
Integer finalSid = sid;
new Thread(new Runnable() {
@@ -944,17 +1108,17 @@
if(one.getPayStatus() == 2){
break;
}
- ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
- if(resultUtil.getCode() == 200 && one.getPayStatus() == 1){
+ AlipayTradeQueryResponse alipayTradeQueryResponse = payMoneyUtil.queryALIOrder(code);
+ if( one.getPayStatus() == 1){
/**
* WAIT_BUYER_PAY（交易创建，等待买家付款）、
* TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
* TRADE_SUCCESS（交易支付成功）、
* TRADE_FINISHED（交易结束，不可退款）
*/
- Map<String, String> data1 = resultUtil.getData();
- String s = data1.get("tradeStatus");
- String tradeNo = data1.get("tradeNo");
+ String s = alipayTradeQueryResponse.getTradeStatus();
+
+ String tradeNo = alipayTradeQueryResponse.getTradeNo();
if("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10){
for (TCoursePackagePayment coursePackagePayment : list) {
coursePackagePayment.setStatus(3);
@@ -966,18 +1130,24 @@
for (TCoursePackagePayment coursePackagePayment : list) {
coursePackagePayment.setPayStatus(2);
coursePackagePayment.setOrderNumber(tradeNo);
+ coursePackagePayment.setAppUserId(null);
}
coursePackagePaymentService.updateBatchById(list);
System.out.println("===========到达支付");
// 2.0
+ String[] coupons = coursePackagePaymentConfig.getCouponIds().split(",");
+
+
+
userCouponClient.sendUserCoupon(new SendCouponReq(uid,coursePackagePaymentConfig.getCouponIds()));
+ for (TCoursePackagePayment coursePackagePayment : list) {
+ addPackageStudent(paymentCourseVo.getId(),uid, finalSid,coursePackagePayment.getId(),paymentCourseVo.getPrice());
+
+
+ }
moneyOut(tradeNo,tradeNo);
-
-
-
-
@@ -987,7 +1157,6 @@
if(student!=null){
}
- addPackageStudent(paymentCourseVo.getId(),uid, finalSid,one.getId());
break;
}
if("WAIT_BUYER_PAY".equals(s)){
@@ -1005,6 +1174,8 @@
}
+ @Autowired
+ private TCoursePackageService coursePackageService;
public void moneyOut(String outNum,String tradeNo) throws AlipayApiException {
AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2");
AlipayTradeOrderSettleRequest request = new AlipayTradeOrderSettleRequest();
@@ -1012,28 +1183,85 @@
model.setOutRequestNo(outNum);
model.setTradeNo(tradeNo);
List<RoyaltyDetailInfos> royaltyDetailInfos = new ArrayList<>();
+//
+
+ AlipayTradeRoyaltyRelationBindRequest request1 = new AlipayTradeRoyaltyRelationBindRequest();
+ AlipayTradeRoyaltyRelationBindModel bindModel = new AlipayTradeRoyaltyRelationBindModel();
- RoyaltyDetailInfos royaltyDetailInfos1 = new RoyaltyDetailInfos();
- royaltyDetailInfos1.setTransOutType("userId");
- royaltyDetailInfos1.setTransOut("2021004105665036");
- royaltyDetailInfos1.setTransInType("loginName");
- royaltyDetailInfos1.setTransIn("18398968484");
- royaltyDetailInfos1.setAmount("0.1");
+ request1.setBizContent("{" +
+ " \"receiver_list\":[" +
+ " {" +
+ " \"type\":\"loginName\"," +
+ " \"account\":\"19522115070\"," +
+ " \"name\":\"罗易胜\"," +
+ " \"memo\":\"分账给测试商户\"," +
+ " }" +
+ " ]," +
+ " \"out_request_no\":\""+tradeNo+"\"" +
+ "}");
+ AlipayTradeRoyaltyRelationBindResponse response = alipayClient.execute(request1);
+ if(response.isSuccess()){
+ System.out.println("绑定调用成功");
+ } else {
+ System.out.println("调用失败");
+ }
- royaltyDetailInfos.add(royaltyDetailInfos1);
+
+// RoyaltyDetailInfos royaltyDetailInfos1 = new RoyaltyDetailInfos();
+// royaltyDetailInfos1.setTransOutType("loginName");
+// royaltyDetailInfos1.setTransOut("happysports@weparklife.com");
+// royaltyDetailInfos1.setTransInType("loginName");
+// royaltyDetailInfos1.setTransIn("19522115070");
+//// royaltyDetailInfos1.setAmount("0.01");
+// royaltyDetailInfos1.setAmountPercentage("100");
+
+// royaltyDetailInfos.add(royaltyDetailInfos1);
+
+ TCoursePackagePayment one = coursePackagePaymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("code", outNum));
+ TCoursePackage byId = coursePackageService.getById(one.getCoursePackageId());
+ OperatorUser operatorUser = storeClient.queryByStoreId(byId.getStoreId());
+
+
+
+// Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
+// Integer siteBookings = siteClient.queryByCode(outTradeNo);
+// List<Integer> stores = new ArrayList<>();
+// stores.add(coursePackagePayments);
+// stores.add(paymentCompetitions);
+// stores.add(siteBookings);
+// OperatorUser operatorUser = siteClient.queryOperator(stores);
+
+
+
+
+ OpenApiRoyaltyDetailInfoPojo op = new OpenApiRoyaltyDetailInfoPojo();
+ op.setTransOutType("loginName");
+ op.setTransOut("happysports@weparklife.com");
+ op.setTransInType("userId");
+ op.setTransIn(operatorUser.getAlipayNum());
+ op.setAmountPercentage(Long.valueOf(operatorUser.getAlipayProportion()));
+
+ List<OpenApiRoyaltyDetailInfoPojo> ops = new ArrayList<>();
+ ops.add(op);
+ model.setRoyaltyParameters(ops);
request.setBizModel(model);
- AlipayTradeOrderSettleResponse response = alipayClient.execute(request);
- if(response.isSuccess()){
+ AlipayTradeOrderSettleResponse response1 = alipayClient.execute(request);
+ if(response1.isSuccess()){
System.out.println("调用成功");
} else {
System.out.println("调用失败");
}
}
+
+
+
+ @Autowired
+ private CourseCounsumService courseCounsumService;
@@ -1050,32 +1278,96 @@
String[] split = paymentCourseVo.getStudentIds().split(";");
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
- for (String s : split) {
- TCoursePackagePayment coursePackagePayment = new TCoursePackagePayment();
- coursePackagePayment.setCode(code);
- coursePackagePayment.setAppUserId(appUser.getId());
- coursePackagePayment.setStudentId(Integer.valueOf(s));
- coursePackagePayment.setCoursePackageId(paymentCourseVo.getId());
- coursePackagePayment.setPayType(paymentCourseVo.getPayType());
- coursePackagePayment.setClassHours(coursePackagePaymentConfig.getClassHours());
- coursePackagePayment.setOriginalPrice(paymentCourseVo.getPrice());
- coursePackagePayment.setPlayPaiCoin(paymentPrice.intValue());
- coursePackagePayment.setTotalClassHours(coursePackagePaymentConfig.getClassHours());
- coursePackagePayment.setLaveClassHours(coursePackagePaymentConfig.getClassHours());
- coursePackagePayment.setAbsencesNumber(0);
- coursePackagePayment.setPayUserType(1);
- coursePackagePayment.setPayStatus(2);
- coursePackagePayment.setPayUserId(appUser.getId());
- coursePackagePayment.setStatus(1);
- coursePackagePayment.setState(1);
- coursePackagePayment.setInsertTime(new Date());
- coursePackagePaymentService.save(coursePackagePayment);
- Integer sId=null;
- Student student = studentClient.queryDefaultStudent(appUser.getId());
- if(student!=null){
- sId=student.getId();
+
+
+ //赠送课时
+ int weekday = DateUtil.dayOfWeek(new Date()) - 1;
+ TCoursePackageDiscount discount = coursePackageDiscountService.getOne(new QueryWrapper<TCoursePackageDiscount>().eq("type",4).eq("coursePackageId", paymentCourseVo.getId()).last("limit 1"));
+
+ Integer hour = 0;
+ if (discount!=null) {
+ JSONArray objects = JSONObject.parseArray(discount.getContent());
+ JSONObject parse = JSONObject.parseObject(JSONObject.toJSONString(objects.get(0)));
+ hour = parse.getInteger("hour");
+ if (hour == null) {
+ hour = 0;
}
- addPackageStudent(paymentCourseVo.getId(),appUser.getId(),sId,coursePackagePayment.getId());
+ }
+
+ for (String s : split) {
+ TCoursePackagePayment coursePackagePaymentServiceOne = coursePackagePaymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("studentId", s).eq("coursePackageId", paymentCourseVo.getId()));
+
+
+
+ if (coursePackagePaymentServiceOne==null) {
+ TCoursePackagePayment coursePackagePayment = new TCoursePackagePayment();
+ coursePackagePayment.setCode(code);
+ coursePackagePayment.setAppUserId(appUser.getId());
+ coursePackagePayment.setStudentId(Integer.valueOf(s));
+ coursePackagePayment.setCoursePackageId(paymentCourseVo.getId());
+ coursePackagePayment.setPayType(paymentCourseVo.getPayType());
+ coursePackagePayment.setClassHours(coursePackagePaymentConfig.getClassHours()+hour);
+ coursePackagePayment.setOriginalPrice(paymentCourseVo.getPrice());
+ coursePackagePayment.setPlayPaiCoin(paymentPrice.intValue());
+ coursePackagePayment.setTotalClassHours(coursePackagePaymentConfig.getClassHours()+hour);
+ coursePackagePayment.setLaveClassHours(coursePackagePaymentConfig.getClassHours()+hour);
+ coursePackagePayment.setAbsencesNumber(0);
+ coursePackagePayment.setPayUserType(1);
+ coursePackagePayment.setPayStatus(2);
+ coursePackagePayment.setPayUserId(appUser.getId());
+ coursePackagePayment.setStatus(1);
+ coursePackagePayment.setState(1);
+ coursePackagePayment.setInsertTime(new Date());
+ coursePackagePaymentService.save(coursePackagePayment);
+ Integer sId = null;
+ Student student = studentClient.queryDefaultStudent(appUser.getId());
+ if (student != null) {
+ sId = student.getId();
+ }
+ addPackageStudent(paymentCourseVo.getId(), appUser.getId(), Integer.valueOf(s), coursePackagePayment.getId(),null);
+
+ //课时记录
+ CourseCounsum courseCounsum = new CourseCounsum();
+ courseCounsum.setPaymentId(coursePackagePayment.getId());
+ courseCounsum.setChangeType(1);
+ courseCounsum.setNum(coursePackagePaymentConfig.getClassHours());
+ courseCounsum.setInsertTime(new Date());
+ courseCounsum.setReason("购买课包");
+ courseCounsumService.save(courseCounsum);
+
+ }else {
+ coursePackagePaymentServiceOne.setClassHours(coursePackagePaymentServiceOne.getClassHours()+coursePackagePaymentConfig.getClassHours()+hour);
+ coursePackagePaymentServiceOne.setOriginalPrice(coursePackagePaymentServiceOne.getOriginalPrice()+paymentCourseVo.getPrice());
+ if (coursePackagePaymentServiceOne.getPlayPaiCoin()==null){
+ coursePackagePaymentServiceOne.setPlayPaiCoin(paymentPrice.intValue());
+
+ }else {
+ coursePackagePaymentServiceOne.setPlayPaiCoin(coursePackagePaymentServiceOne.getPlayPaiCoin()+paymentPrice.intValue());}
+ coursePackagePaymentServiceOne.setTotalClassHours(coursePackagePaymentServiceOne.getTotalClassHours()+coursePackagePaymentConfig.getClassHours()+hour);
+ coursePackagePaymentServiceOne.setLaveClassHours(coursePackagePaymentServiceOne.getLaveClassHours()+coursePackagePaymentConfig.getClassHours()+hour);
+ coursePackagePaymentServiceOne.setAppUserId(null);
+ coursePackagePaymentService.updateById(coursePackagePaymentServiceOne);
+
+// coursePackagePaymentService.save(coursePackagePayment);
+ Integer sId = null;
+ Student student = studentClient.queryDefaultStudent(appUser.getId());
+ if (student != null) {
+ sId = student.getId();
+ }
+ addPackageStudent(paymentCourseVo.getId(), appUser.getId(), Integer.valueOf(s), coursePackagePaymentServiceOne.getId(),null);
+
+
+ CourseCounsum courseCounsum = new CourseCounsum();
+ courseCounsum.setPaymentId(coursePackagePaymentServiceOne.getId());
+ courseCounsum.setChangeType(1);
+ courseCounsum.setNum(coursePackagePaymentConfig.getClassHours());
+ courseCounsum.setInsertTime(new Date());
+ courseCounsum.setReason("续课");
+ courseCounsumService.save(courseCounsum);
+
+
+ }
+
}
Integer playPaiCoins = appUser.getPlayPaiCoins();
@@ -1092,109 +1384,90 @@
}
- private void addPackageStudent(Integer courseId, Integer userId, Integer sId,Long paymentId){
+
+
+
+ private void addPackageStudent(Integer courseId, Integer userId, Integer sId,Long paymentId,Double price) throws ParseException {
// 课包
TCoursePackage tCoursePackage = this.baseMapper.selectById(courseId);
+ if (tCoursePackage.getType()==1) {
+ String classWeeks = tCoursePackage.getClassWeeks();
+
+ List<Integer> week = week(classWeeks);
+
+ 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");
+
+ //查出当前用户当前学员当前课包最后一天的排课数据
+ List<CoursePackageStudent> studentCourse = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", sId).eq("coursePackageId", courseId));
+ List<Long> collect = studentCourse.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());
- String classWeeks = tCoursePackage.getClassWeeks();
- List<Integer> week = week(classWeeks);
- 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");
- // 本周周几
- int i = 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());
- try {
- 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(userId);
- student1.setStudentId(sId);
- student1.setCoursePackageId(tCoursePackage.getId());
- student1.setCoursePackagePaymentId(paymentId);
- student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());
- student1.setSignInOrNot(1);
- student1.setReservationStatus(1);
- student1.setInsertTime(new Date());
- cpsMapper.insert(student1);
- } catch (ParseException e) {
- e.printStackTrace();
- }
-
- }
-
- }else if(integer>i) {
- Calendar instance = Calendar.getInstance();
- instance.add(Calendar.DATE,integer-i);
- Date time1 = instance.getTime();
- List<Date> list = new ArrayList<>();
- list.add(time1);
- instance.add(Calendar.DATE,7);
- Date time2 = instance.getTime();
- list.add(time2);
- for (Date time : list) {
- for (int i1 = 0; i1 < split.length; i1++) {
- CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
- coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
- try {
- 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(userId);
- student1.setStudentId(sId);
- student1.setCoursePackageId(tCoursePackage.getId());
- student1.setCoursePackagePaymentId(paymentId);
- student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());
- student1.setSignInOrNot(1);
- student1.setReservationStatus(1);
- student1.setInsertTime(new Date());
- cpsMapper.insert(student1);
- } catch (ParseException e) {
- e.printStackTrace();
- }
- }
+ //拿到最后一天的排课记录
+ if (collect.size() > 0){
+ coursePackageSchedulingService.remove(new QueryWrapper<CoursePackageScheduling>().in("id", collect));
+ coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().eq("studentId", sId).eq("coursePackageId", courseId));
+ if (price!=null) {
+ CourseCounsum courseCounsum = new CourseCounsum();
+ courseCounsum.setPaymentId(paymentId);
+ courseCounsum.setChangeType(3);
+ courseCounsum.setInsertTime(new Date());
+ courseCounsum.setReason("续课;" + price);
+ courseCounsum.setAppUserId(userId);
+ courseCounsumService.save(courseCounsum);
}
}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());
- try {
- Date parse = format1.parse(format.format(time) + " " + split[i1]);
- Date parse1 = format1.parse(format.format(time) + " " + split1[i1]);
+ if (price!=null) {
+ CourseCounsum courseCounsum = new CourseCounsum();
+ courseCounsum.setPaymentId(paymentId);
+ courseCounsum.setChangeType(3);
+ courseCounsum.setInsertTime(new Date());
+ courseCounsum.setReason("报名课程;" + price);
+ courseCounsum.setAppUserId(userId);
+ courseCounsumService.save(courseCounsum);
+ }
+ }
+ Date today = new Date();
+ TCoursePackagePayment pay = coursePackagePaymentService.getById(paymentId);
+ Integer laveClassHours = pay.getLaveClassHours();
+ Integer codeTime = tCoursePackage.getCodeTime();
+ Integer can = 0;
+ int count = 0;
+ // 本周周几
+ Date[] dates = generateDateArray(14, today);
+ if (tCoursePackage.getType() == 1) {
+ can = laveClassHours / codeTime;
+ }
+ if (tCoursePackage.getType() == 2) {
+ Date startDate = tCoursePackage.getStartTime();
+ Date endDate = tCoursePackage.getEndTime();
+ dates = generateDateArray1(startDate, endDate);
+ can = 999;
+ }
+ for (Date date : dates) {
+ if (count == can) {
+ break;
+ }
+ int wei = 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(userId);
student1.setStudentId(sId);
@@ -1205,17 +1478,81 @@
student1.setReservationStatus(1);
student1.setInsertTime(new Date());
cpsMapper.insert(student1);
- } catch (ParseException e) {
- e.printStackTrace();
+ count++;
+ }
+ }
+ }
+
+ }else if (tCoursePackage.getType()==2){
+ String classWeeks = tCoursePackage.getClassWeeks();
+ List<Integer> week = week(classWeeks);
+
+ Date today = new Date();
+
+ Date startTime = tCoursePackage.getStartTime();
+ Date endTime = tCoursePackage.getEndTime();
+ LocalDate startDate = startTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+ LocalDate endDate = endTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+ Period period = Period.between(startDate, endDate);
+ int days = period.getDays() + 1;
+ Integer can =999;
+ 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");
+
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(startTime);
+ calendar.add(Calendar.DAY_OF_MONTH, -1);
+
+ TCoursePackagePayment pay = coursePackagePaymentService.getById(paymentId);
+
+
+ Date[] dates = generateDateArray(days,calendar.getTime());
+ for (Date date : dates) {
+ if (count==can){
+ break;
+ }
+ int wei = cn.hutool.core.date.DateUtil.dayOfWeek(date)-1;
+ if (wei == 0){
+ wei =7;
+ }
+ 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(userId);
+ student1.setStudentId(sId);
+ student1.setCoursePackageId(tCoursePackage.getId());
+ student1.setCoursePackagePaymentId(pay.getId());
+ student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());
+ student1.setSignInOrNot(1);
+ student1.setReservationStatus(1);
+ student1.setInsertTime(new Date());
+ cpsMapper.insert(student1);
+ count++;
}
}
}
}
+
+
// 2.0
TCourseInfoRecord tCourseInfoRecord = new TCourseInfoRecord();
tCourseInfoRecord.setUserId(userId);
tCourseInfoRecord.setCourseId(courseId);
- tCourseInfoRecord.setName("报名假期班");
+ tCourseInfoRecord.setName("报名运动营");
tCourseInfoRecord.setNum(tCoursePackage.getNeedNum());
tCourseInfoRecord.setTime(new Date());
tCourseInfoRecord.setType(2);
@@ -1223,6 +1560,28 @@
}
+
+
+ public static Date[] generateDateArray1(Date startDate, Date endDate) {
+ List<Date> dateList = new ArrayList<>();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(startDate);
+
+ while (!calendar.getTime().after(endDate)) {
+ Date currentDate = calendar.getTime();
+ dateList.add(currentDate);
+ calendar.add(Calendar.DAY_OF_MONTH, 1);
+ }
+
+ return dateList.toArray(new Date[0]);
+ }
+
+ public static Date createDate1(int year, int month, int day) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(year, month - 1, day);
+ return calendar.getTime();
+ }
+
private List<Integer> week(String week){
String[] split = week.split(";");
ArrayList<Integer> integers = new ArrayList<>();
@@ -1255,6 +1614,20 @@
}
+
+ 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;
+ }
/**
* 获取课包管理列表数据
* @param queryCoursePackageLists
@@ -1293,7 +1666,7 @@
@Override
public Integer addCoursePackage(TCoursePackage coursePackage) {
try {
- coursePackage.setAuditStatus(2);
+
this.baseMapper.insert(coursePackage);
if (coursePackage.getClassStartTime()!=null&&coursePackage.getClassStartTime()!="") {
@@ -1330,7 +1703,7 @@
Calendar e = Calendar.getInstance();
e.setTime(date);
- e.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 13);
+ e.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 14);
long timeInMillis = e.getTimeInMillis();
while (true) {
@@ -1357,7 +1730,7 @@
coursePackageSchedulingService.save(coursePackageScheduling);
}
s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 1);
- if (s.getTimeInMillis() > timeInMillis) {
+ if (s.getTimeInMillis() >= timeInMillis) {
break;
}
}
@@ -1391,6 +1764,7 @@
coursePackageSchedulingService.remove(coursePackageSchedulingQueryWrapper);
this.baseMapper.updateById(coursePackage);
+
//生成排课数据
Date date = null;
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -1417,7 +1791,7 @@
int d = Long.valueOf(14L - ((s.getTimeInMillis() - time) / 86400000L)).intValue();
e.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + d);
}else{
- e.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 13);
+ e.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 14);
}
long timeInMillis = e.getTimeInMillis();
@@ -1488,17 +1862,34 @@
}
@Override
- public String getHours(Integer coursePackageId) {
+ public Integer getHours(Integer coursePackageId) {
return this.baseMapper.getHours(coursePackageId);
}
@Override
public ResultUtil paymentCourseCouponList(Integer uid, Integer coursePackagePaymentConfigId) {
- CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getById(coursePackagePaymentConfigId);
- if(ToolUtil.isEmpty(coursePackagePaymentConfig.getCouponIds())){
- coursePackagePaymentConfig.setCouponIds("-1");
+// CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getById(coursePackagePaymentConfigId);
+// if(ToolUtil.isEmpty(coursePackagePaymentConfig.getCouponIds())){
+// coursePackagePaymentConfig.setCouponIds("-1");
+// }
+// List<Coupon> coupons = couponClient.getCoupons(coursePackagePaymentConfig.getCouponIds());
+
+ List<Coupon> coupons = couponClient.queryCouponByUid(uid);
+
+
+ if (CollectionUtil.isNotEmpty(coupons)) {
+ for (Coupon coupon : coupons){
+ Date date1 = coupon.getStartTime(); // 2023-10-01 00:00:00
+ Date date2 = coupon.getEndTime(); // 2023-10-12 00:00:00
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+ String dateString1 = sdf.format(date1);
+ String dateString2 = sdf.format(date2);
+
+ String result = dateString1 + "-" + dateString2;
+ coupon.setTimePeriod(result);
+ }
}
- List<Coupon> coupons = couponClient.getCoupons(coursePackagePaymentConfig.getCouponIds());
return ResultUtil.success(coupons);
}
}
--
Gitblit v1.7.1