From ddbb38c54db9c3670e5ff53f4bf713525de1099d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 14 十一月 2023 09:12:10 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 392 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 325 insertions(+), 67 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index 1c885e3..8834457 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -54,10 +54,7 @@
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneId;
+import java.time.*;
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.stream.Collectors;
@@ -184,8 +181,6 @@
String[] end = value1.split(",");
for (int i = 0; i < star.length; i++) {
// int index = star[i].indexOf(",");
- //
- //
// String result = value.substring(0, index).trim();
String classStartTime = star[i];
String[] split = classStartTime.split(":");
@@ -203,7 +198,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){
@@ -234,7 +229,7 @@
.eq("coursePackageId", coursePackage.getId())
.eq("classDate", classDate.getTime())
.eq("endDate", endDate.getTime()));
- if (list.size()+1>coursePackage.getMaxSubscribeNumber()){
+ if (list1.size()+1>coursePackage.getMaxSubscribeNumber()){
// 当前课包预约人数已满
return 5001;
}
@@ -269,6 +264,13 @@
public Object changeState(@RequestBody CoursePackagePayDTO dto){
return packagePaymentService.changeState(dto);
+ }
+ @GetMapping("/coursePackagePayment/courseStore/{appUserId}/{coursePackageId}")
+ public List<TCoursePackagePayment> getByUserIdAndCoursePackageId(@PathVariable("appUserId") Integer appUserId,@PathVariable("coursePackageId") Integer coursePackageId){
+ List<TCoursePackagePayment> list = packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>()
+ .eq("appUserId", appUserId)
+ .eq("coursePackageId", coursePackageId));
+ return list;
}
/**
* 获取购课记录
@@ -328,7 +330,8 @@
re.setBuyTypeName("手动支付"+"-"+re.getBuyTypeName());
}
}
-
+ BigDecimal subtract = re.getOriginalPrice().subtract(re.getCashPayment());
+ re.setDiscountAmount(subtract);
// 如果支付用户类型为管理员 则购买方式则为1线下购买
if (re.getPayUserType()!=null){
if (re.getPayUserType()== 2){
@@ -372,11 +375,15 @@
}
}
}
-
List<RegisterOrderVO> res = packagePaymentService.listAllRegister(query);
// 该运营商下没有门店
- if (query.getStoresIds()!=null){
- if (query.getStoresIds().size()==0){
+ if (query.getInsertType() == 2){
+ if (query.getStoresIds()!=null){
+ if (query.getStoresIds().size()==0){
+ List<RegisterOrderVO> registerOrderVOS = new ArrayList<>();
+ return registerOrderVOS;
+ }
+ }else{
List<RegisterOrderVO> registerOrderVOS = new ArrayList<>();
return registerOrderVOS;
}
@@ -386,7 +393,6 @@
Iterator<RegisterOrderVO> iterator = res.iterator();
while (iterator.hasNext()) {
RegisterOrderVO re = iterator.next();
-
if (re.getSalesName() == null) {
re.setSalesName("无");
}
@@ -397,17 +403,17 @@
re.setPayMoneyAndType("￥" + re.getMoney());
}
}
- Store store = storeClient.queryStoreById(re.getStoreId());
+ if (re.getStoreId()!=null){
+ Store store = storeClient.queryStoreById(re.getStoreId());
+ if (store!=null){
+ re.setStoreName(store.getName());
+ }
+ }
TAppUser appUser = appUserClient.queryAppUser1(re.getAppUserId());
Student student = studentClient.queryStudentById(re.getStudentId());
re.setPayStudent(student.getName());
re.setPayUser(appUser.getName());
re.setPhone(appUser.getPhone());
- re.setStoreName(store.getName());
- // 在这里添加条件来删除不满足要求的元素
- if (appUser.getInsertType() != query.getInsertType()) {
- iterator.remove(); // 使用迭代器的 remove 方法删除元素
- }
}
return res;
}
@@ -429,6 +435,9 @@
if (byUserId.size() > 0 ){
for (TCoursePackagePayment tCoursePackagePayment : byUserId) {
TCoursePackage tCoursePackage = tcpService.getById(tCoursePackagePayment.getCoursePackageId());
+ if (tCoursePackage.getType()==3){
+ continue;
+ }
StuCourseResp resp = new StuCourseResp();
resp.setCourseId(tCoursePackage.getId());
resp.setId(tCoursePackagePayment.getId());
@@ -753,13 +762,13 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
- public ResultUtil<List<AppUserVideoResponse>> queryAfterSourceList( CourseOfAfterRequest search){
+ public ResultUtil<List<AppUserVideoResponse>> queryAfterSourceList( CourseOfAfterRequest search) throws Exception {
// try {
-// Integer appUserId = tokenUtil.getUserIdFormRedis();
-//
-// if(null == appUserId){
-// return ResultUtil.tokenErr();
-// }
+ Integer appUserId = tokenUtil.getUserIdFormRedis();
+
+ if(null == appUserId){
+ return ResultUtil.tokenErr();
+ }
//
// List<Integer> courseIds = new ArrayList<>();
// QueryWrapper<TCoursePackagePayment> queryWrapper = new QueryWrapper<TCoursePackagePayment>().eq("appUserId", appUserId)
@@ -773,7 +782,7 @@
// }
- QueryWrapper<CoursePackageStudent> queryWrapper1 = new QueryWrapper<CoursePackageStudent>().eq("appUserId", 19);
+ QueryWrapper<CoursePackageStudent> queryWrapper1 = new QueryWrapper<CoursePackageStudent>().eq("appUserId", appUserId);
if (ToolUtil.isNotEmpty(search.getCourseTypeId())){
queryWrapper1.eq("coursePackageId",search.getCourseTypeId());
}
@@ -996,6 +1005,7 @@
*/
@PostMapping("/base/coursePackage/alipayRegisteredCoursesCallback")
public void alipayCallback(HttpServletRequest request, HttpServletResponse response){
+ System.err.println("========支付宝支付回调========");
try {
Map<String, String> map = payMoneyUtil.alipayCallback(request);
if(null != map){
@@ -1081,6 +1091,24 @@
}
+ public static Date[] generateDateArray(int numDays,Date date) {
+// LocalDate tomorrow = LocalDate.now().plusDays(1);
+ LocalDate tomorrow = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().plusDays(1);
+
+ Date[] dates = new Date[numDays];
+
+ for (int i = 0; i < numDays; i++) {
+ LocalDate currentDate = tomorrow.plusDays(i);
+ dates[i] = Date.from(currentDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
+ }
+
+ return dates;
+ }
+
+ @Autowired
+ private TCoursePackageService packageService;
+ @Autowired
+ CoursePackageStudentService studentService ;
/**
* 课程用于支付进行扣减
* @param paymentDeductionClassHour
@@ -1090,62 +1118,287 @@
public void paymentDeductionClassHour(@RequestBody PaymentDeductionClassHour paymentDeductionClassHour){
try {
// 2.0 用id进行查询
- List<TCoursePackagePayment> list = packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>().eq("id", paymentDeductionClassHour.getCourseId()).eq("payStatus", 2)
+ TCoursePackagePayment coursePackagePayment= packagePaymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("id", paymentDeductionClassHour.getCourseId()).eq("payStatus", 2)
.eq("status", 1).eq("state", 1).gt("laveClassHours", 0));
Integer classHour = paymentDeductionClassHour.getClassHour();
- for (TCoursePackagePayment coursePackagePayment : list) {
- if(coursePackagePayment.getLaveClassHours().compareTo(classHour) >= 0){
+// for (TCoursePackagePayment coursePackagePayment : list) {
+ if (coursePackagePayment.getLaveClassHours().compareTo(classHour) >= 0) {
coursePackagePayment.setLaveClassHours(coursePackagePayment.getLaveClassHours() - classHour);
+ coursePackagePayment.setAppUserId(null);
packagePaymentService.updateById(coursePackagePayment);
- // 2.0 少于3课时 推送
- if(coursePackagePayment.getLaveClassHours()<=3){
- Integer appUserId = coursePackagePayment.getAppUserId();
- //调用推送
- HttpHeaders headers = new HttpHeaders();
- // 以表单的方式提交
- headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
- String s1 = appUserId + "_" + "Three";
- //定时修改排课状态
- String s = internalRestTemplate.getForObject("http://mb-cloud-gateway/netty/sendMsgToClient?id="+s1, String.class);
- JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
- if(jsonObject1.getIntValue("code") != 200){
- System.err.println(jsonObject1.getString("msg"));
+// coursePackageSchedulingService.remove(new QueryWrapper<CoursePackageScheduling>().eq("courseId", coursePackagePayment.getCoursePackageId()));
+
+
+ List<CoursePackageStudent> studentCourse = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", coursePackagePayment.getStudentId()).eq("coursePackageId", coursePackagePayment.getCoursePackageId()));
+ List<Long> collect = studentCourse.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());
+ coursePackageSchedulingService.remove(new QueryWrapper<CoursePackageScheduling>().in("id",collect));
+ coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().eq("studentId", paymentDeductionClassHour.getId()).eq("coursePackageId", coursePackagePayment.getCoursePackageId()));
+
+
+
+
+ Student student = studentClient.queryStudentById(coursePackagePayment.getStudentId());
+
+ TCoursePackage tCoursePackage = packageService.getById(coursePackagePayment.getCoursePackageId());
+ String classWeeks = tCoursePackage.getClassWeeks();
+ List<Integer> week = week(classWeeks);
+
+ List<TCoursePackagePayment> pays = packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>().eq("coursePackageId", coursePackagePayment.getCoursePackageId()).eq("studentId", coursePackagePayment.getStudentId()));
+
+
+ for (TCoursePackagePayment pay : pays) {
+
+
+ List<CoursePackageStudent> studentCourse1 = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", pay.getStudentId()).eq("coursePackageId", pay.getCoursePackageId()));
+ List<Long> collect1 = studentCourse1.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());
+ //拿到最后一天的排课记录
+
+ CoursePackageScheduling cs = null;
+ if (collect1.size()>0) {
+ cs = coursePackageSchedulingService.getOne(new QueryWrapper<CoursePackageScheduling>().in("id", collect1).orderByDesc("classDate").last("limit 1"));
+
+ }
+//
+// Calendar calendar = Calendar.getInstance();
+// Date currentDate = calendar.getTime();
+// calendar.add(Calendar.DAY_OF_MONTH, -1);
+// Date today = calendar.getTime();
+ Date today = new Date();
+
+ //判断最后一天是否超过当前日期
+ if (cs==null||cs.getClassDate().before(new Date())){
+ }else {
+ today = cs.getClassDate();
+ }
+
+ Integer laveClassHours = pay.getLaveClassHours();
+ Integer codeTime = tCoursePackage.getCodeTime();
+ Integer can = laveClassHours/codeTime;
+
+ int count = 0;
+
+
+ String[] split = tCoursePackage.getClassStartTime().split(",");
+ String[] split1 = tCoursePackage.getClassEndTime().split(",");
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+ Date[] dates = generateDateArray(14,today);
+ for (Date date : dates) {
+ if (count==can){
+ break;
+ }
+ int wei = cn.hutool.core.date.DateUtil.dayOfWeek(date);
+ if (week.contains(wei)){
+ for (int i1 = 0; i1 < split.length; i1++) {
+ if (count==can){
+ break;
+ }
+ CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
+ coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+ Date parse = format1.parse(format.format(date) + " " + split[i1]);
+ Date parse1 = format1.parse(format.format(date) + " " + split1[i1]);
+ coursePackageScheduling.setClassDate(parse);
+ coursePackageScheduling.setEndDate(parse1);
+ coursePackageScheduling.setStatus(1);
+ coursePackageSchedulingService.save(coursePackageScheduling);
+ CoursePackageStudent student1 = new CoursePackageStudent();
+ student1.setAppUserId(pay.getAppUserId());
+ student1.setStudentId(pay.getStudentId());
+ student1.setCoursePackageId(pay.getCoursePackageId());
+ student1.setCoursePackagePaymentId(pay.getId());
+ student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());
+ student1.setSignInOrNot(1);
+ student1.setReservationStatus(1);
+ student1.setInsertTime(new Date());
+ studentService.save(student1);
+ count++;
+ }
}
}
- CancelledClasses cancelledClasses = new CancelledClasses();
- cancelledClasses.setType(2);
- cancelledClasses.setVoucher(paymentDeductionClassHour.getCode());
- cancelledClasses.setCoursePackageId(coursePackagePayment.getCoursePackageId());
- cancelledClasses.setCoursePackagePaymentId(coursePackagePayment.getId());
- cancelledClasses.setCancelledClassesNumber(classHour);
- cancelledClasses.setInsertTime(new Date());
- cancelledClassesService.save(cancelledClasses);
- break;
- }else{
- CancelledClasses cancelledClasses = new CancelledClasses();
- cancelledClasses.setType(2);
- cancelledClasses.setVoucher(paymentDeductionClassHour.getCode());
- cancelledClasses.setCoursePackageId(coursePackagePayment.getCoursePackageId());
- cancelledClasses.setCoursePackagePaymentId(coursePackagePayment.getId());
- cancelledClasses.setCancelledClassesNumber(coursePackagePayment.getLaveClassHours());
- cancelledClasses.setInsertTime(new Date());
- cancelledClassesService.save(cancelledClasses);
+ }
- coursePackagePayment.setLaveClassHours(0);
- packagePaymentService.updateById(coursePackagePayment);
- classHour -= cancelledClasses.getCancelledClassesNumber();
- }
- }
+
+
+
+// // 本周周几
+// int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date()) - 1;
+// for (Integer integer : week) {
+// if (integer < i) {
+// // 找下一周的时间
+// Calendar instance = Calendar.getInstance();
+// instance.add(Calendar.DATE, 7 - (i - integer));
+// Date time = instance.getTime();
+//
+// for (int i1 = 0; i1 < split.length; i1++) {
+//
+// CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
+// coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+// Date parse = format1.parse(format.format(time) + " " + split[i1]);
+// Date parse1 = format1.parse(format.format(time) + " " + split1[i1]);
+// coursePackageScheduling.setClassDate(parse);
+// coursePackageScheduling.setEndDate(parse1);
+// coursePackageScheduling.setStatus(1);
+// coursePackageSchedulingService.save(coursePackageScheduling);
+// CoursePackageStudent student1 = new CoursePackageStudent();
+// student1.setAppUserId(student.getAppUserId());
+// student1.setStudentId(student.getId());
+// student1.setCoursePackageId(tCoursePackage.getId());
+// student1.setCoursePackagePaymentId(coursePackagePayment.getId());
+// student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());
+// student1.setSignInOrNot(1);
+// student1.setReservationStatus(1);
+// student1.setInsertTime(new Date());
+// studentService.save(student1);
+//
+// }
+//
+// } else if (integer > i) {
+// Calendar instance = Calendar.getInstance();
+// instance.add(Calendar.DATE, integer - i);
+// Date time1 = instance.getTime();
+// List<Date> list6 = new ArrayList<>();
+// list6.add(time1);
+// instance.add(Calendar.DATE, 7);
+// Date time2 = instance.getTime();
+// list6.add(time2);
+// for (Date time : list6) {
+// for (int i1 = 0; i1 < split.length; i1++) {
+// CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
+// coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+// Date parse = format1.parse(format.format(time) + " " + split[i1]);
+// Date parse1 = format1.parse(format.format(time) + " " + split1[i1]);
+// coursePackageScheduling.setClassDate(parse);
+// coursePackageScheduling.setEndDate(parse1);
+// coursePackageScheduling.setStatus(1);
+// coursePackageSchedulingService.save(coursePackageScheduling);
+//
+// CoursePackageStudent student1 = new CoursePackageStudent();
+// student1.setAppUserId(student.getAppUserId());
+// student1.setStudentId(student.getId());
+// student1.setCoursePackageId(tCoursePackage.getId());
+// student1.setCoursePackagePaymentId(coursePackagePayment.getId());
+// student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());
+// student1.setSignInOrNot(1);
+// student1.setReservationStatus(1);
+// student1.setInsertTime(new Date());
+// studentService.save(student1);
+// }
+// }
+//
+// } else {
+// Calendar instance = Calendar.getInstance();
+// instance.add(Calendar.DATE, 7);
+// Date time = instance.getTime();
+//
+// for (int i1 = 0; i1 < split.length; i1++) {
+// CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
+// coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+// Date parse = format1.parse(format.format(time) + " " + split[i1]);
+// Date parse1 = format1.parse(format.format(time) + " " + split1[i1]);
+// coursePackageScheduling.setClassDate(parse);
+// coursePackageScheduling.setEndDate(parse1);
+// coursePackageScheduling.setStatus(1);
+// coursePackageSchedulingService.save(coursePackageScheduling);
+//
+// CoursePackageStudent student1 = new CoursePackageStudent();
+// student1.setAppUserId(student.getAppUserId());
+// student1.setStudentId(student.getId());
+// student1.setCoursePackageId(tCoursePackage.getId());
+// student1.setCoursePackagePaymentId(coursePackagePayment.getId());
+// student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());
+// student1.setSignInOrNot(1);
+// student1.setReservationStatus(1);
+// student1.setInsertTime(new Date());
+// studentService.save(student1);
+// }
+// }
+// }
+
+
+ // 2.0 少于3课时 推送
+ if (coursePackagePayment.getLaveClassHours() <= 3) {
+ Integer appUserId = coursePackagePayment.getAppUserId();
+
+ //调用推送
+ HttpHeaders headers = new HttpHeaders();
+ // 以表单的方式提交
+ headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ String s1 = appUserId + "_" + "Three";
+ //定时修改排课状态
+ String s = internalRestTemplate.getForObject("http://mb-cloud-gateway/netty/sendMsgToClient?id=" + s1, String.class);
+ JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
+ if (jsonObject1.getIntValue("code") != 200) {
+ System.err.println(jsonObject1.getString("msg"));
+ }
+ }
+
+ CancelledClasses cancelledClasses = new CancelledClasses();
+ cancelledClasses.setType(2);
+ cancelledClasses.setVoucher(paymentDeductionClassHour.getCode());
+ cancelledClasses.setCoursePackageId(coursePackagePayment.getCoursePackageId());
+ cancelledClasses.setCoursePackagePaymentId(coursePackagePayment.getId());
+ cancelledClasses.setCancelledClassesNumber(classHour);
+ cancelledClasses.setInsertTime(new Date());
+ cancelledClassesService.save(cancelledClasses);
+
+ }else{
+ CancelledClasses cancelledClasses = new CancelledClasses();
+ cancelledClasses.setType(2);
+ cancelledClasses.setVoucher(paymentDeductionClassHour.getCode());
+ cancelledClasses.setCoursePackageId(coursePackagePayment.getCoursePackageId());
+ cancelledClasses.setCoursePackagePaymentId(coursePackagePayment.getId());
+ cancelledClasses.setCancelledClassesNumber(coursePackagePayment.getLaveClassHours());
+ cancelledClasses.setInsertTime(new Date());
+ cancelledClassesService.save(cancelledClasses);
+
+ coursePackagePayment.setLaveClassHours(0);
+ packagePaymentService.updateById(coursePackagePayment);
+
+ classHour -= cancelledClasses.getCancelledClassesNumber();
+ }
+// }
+
+
}catch (Exception e){
e.printStackTrace();
}
}
-
+ private List<Integer> week(String week){
+ String[] split = week.split(";");
+ ArrayList<Integer> integers = new ArrayList<>();
+ for (String s : split) {
+ switch (s){
+ case "周一":
+ integers.add(1);
+ break;
+ case "周二":
+ integers.add(2);
+ break;
+ case "周三":
+ integers.add(3);
+ break;
+ case "周四":
+ integers.add(4);
+ break;
+ case "周五":
+ integers.add(5);
+ break;
+ case "周六":
+ integers.add(6);
+ break;
+ case "周日":
+ integers.add(7);
+ break;
+ }
+ }
+ return integers;
+ }
/**
* 取消赛事回退支付课时
* @param paymentDeductionClassHour
@@ -1555,13 +1808,18 @@
in(CoursePackageStudent::getCoursePackagePaymentId, ids)
);
- detailsListVo.setType(1);
if(list4.size()>0){
Integer signInOrNot = list4.get(0).getSignInOrNot();
+ detailsListVo.setType(1);
+
if(signInOrNot==2){
detailsListVo.setType(3);
}
detailsListVo.setIsType(list4.get(0).getType());
+
+ }else {
+ detailsListVo.setType(2);
+
}
} else {
--
Gitblit v1.7.1