From d36bf25f7494870cbb77c256a04dd8c8b2d42f31 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 28 十一月 2023 11:38:25 +0800
Subject: [PATCH] 11.11
---
cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java | 8 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java | 1
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java | 41 +++++----
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 28 +++++--
cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java | 11 ++
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 24 +++--
cloud-server-management/src/main/java/com/dsh/course/entity/CoursePackageOrderStudent.java | 94 +++++++++++++++++++++++
cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageOrderStudent.java | 1
8 files changed, 169 insertions(+), 39 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java
index 54f63a2..0f9a839 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java
@@ -126,6 +126,9 @@
@Autowired
private CourseCounsumService courseCounsumService;
+
+ @Autowired
+ private ICoursePackageOrderStudentService orderStudentService;
/**
* 添加数据
*
@@ -136,9 +139,10 @@
public void addCancelledClasses(@RequestBody CancelledClasses cancelledClasses) {
cancelledClassesService.save(cancelledClasses);
- TCoursePackagePayment byId = coursePackagePaymentService.getById(cancelledClasses.getCoursePackagePaymentId());
+// TCoursePackagePayment byId = coursePackagePaymentService.getById(cancelledClasses.getCoursePackagePaymentId());
+ orderStudentService.getById(cancelledClasses.getCoursePackagePaymentId());
CourseCounsum courseCounsum = new CourseCounsum();
- courseCounsum.setPaymentId(byId.getId());
+ courseCounsum.setPaymentId(cancelledClasses.getCoursePackagePaymentId());
courseCounsum.setChangeType(0);
courseCounsum.setNum(cancelledClasses.getCancelledClassesNumber());
courseCounsum.setInsertTime(new Date());
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 50f4bc6..1845076 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
@@ -854,9 +854,6 @@
return videoVos;
}
-
-
-
@PostMapping("/base/coursePack/allPaymentCourseList")
@ResponseBody
public List<CouponPaymentVo> getAppuserCourseList(@RequestBody Integer appUserId) {
@@ -1138,7 +1135,6 @@
}
-
/**
* 已报名课程详情
*/
@@ -1153,7 +1149,7 @@
@ApiImplicitParam(name = "orderId", value = "订单id", dataType = "int")
})
- public ResultUtil<CourseDetailsResponse> getRegisteredData(Long coursePayId, String lon, String lat, Integer orderId) {
+ public ResultUtil<CourseDetailsResponse> getRegisteredData(Long coursePayId, String lon, String lat) {
try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if (null == appUserId) {
@@ -1161,9 +1157,7 @@
}
CourseDetailsResponse courseDetailsResponse = packagePaymentService.queryRegisteredCourseDetails(coursePayId, appUserId, lon, lat);
-
-
-
+//
// if (orderId != null) {
// TOrder byId = orderService.getById(orderId);
// courseDetailsResponse.setAmount(byId.getPrice());
@@ -2381,6 +2375,12 @@
return packagePaymentService.getById(id);
}
+ @ResponseBody
+ @PostMapping("/coursePackagePayment/queryCoursePackagePaymentById1")
+ public CoursePackageOrderStudent queryCoursePackagePaymentById1(@RequestParam("id") Long id) {
+ return coursePackageOrderStudentService.getById(id);
+ }
+
// @Autowired
// private ICoursePackageOrderStudentService orderStudentService;
@@ -2443,6 +2443,16 @@
System.out.println("editCoursePackagePayment1====coursePackagePayment" + coursePackagePayment);
// coursePackagePayment.setCoursePackageId(null);
packagePaymentService.updateBytime(coursePackagePayment);
+ }
+
+ @ResponseBody
+ @PostMapping("/coursePackagePayment/editCoursePackagePayment2")
+ public void editCoursePackagePayment2(@RequestBody CoursePackageOrderStudent coursePackageOrderStudent) {
+ System.out.println("editCoursePackagePayment1====coursePackagePayment" + coursePackageOrderStudent);
+// coursePackagePayment.setCoursePackageId(null);
+// packagePaymentService.updateBytime(coursePackagePayment);
+
+ coursePackageOrderStudentService.updateById(coursePackageOrderStudent);
}
@@ -2543,6 +2553,8 @@
map.put("name", store.getName());
map.put("lon", lon);
map.put("lat", lat);
+
+
// 找出门店的所有课程 排出体验
List<TCoursePackage> list = tcpService.list(new LambdaQueryWrapper<TCoursePackage>().eq(TCoursePackage::getStoreId, courseDetailReq.getStoreId()).ne(TCoursePackage::getType, 3).eq(TCoursePackage::getState, 1).like(TCoursePackage::getClassWeeks, week));
List<Integer> collect = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
diff --git a/cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageOrderStudent.java b/cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageOrderStudent.java
index 0179da0..52b76d7 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageOrderStudent.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageOrderStudent.java
@@ -89,5 +89,6 @@
* 课程有效期
*/
@TableField("useTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date useTime;
}
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 e91b2dd..9e13e0d 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
@@ -589,7 +589,9 @@
response.setVipAmount(discountMember);
break;
case 3:
- response.setWpGold(playPaiCoin);
+ if (playPaiCoin!=null) {
+ response.setWpGold(playPaiCoin);
+ }
break;
}
@@ -707,16 +709,16 @@
TCoursePackageDiscount discount = coursePackageDiscountService.getOne(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", coursePackagePaymentConfig.getId())
.eq("type", 2).eq("auditStatus", 2));
- Double continuingMember = JSON.parseObject(discount.getContent()).getDouble("continuingUser");
- Double vipcontinuingMember = JSON.parseObject(discount.getContent()).getDouble("continuingMember");
-
-
- if (coursePackagePaymentConfigVo.getPaymentPrice() > continuingMember) {
- coursePackagePaymentConfigVo.setPaymentPrice(continuingMember);
- }
- if (coursePackagePaymentConfigVo.getVipPrice() > vipcontinuingMember) {
- coursePackagePaymentConfigVo.setVipPrice(vipcontinuingMember);
- }
+// Double continuingMember = JSON.parseObject(discount.getContent()).getDouble("continuingUser");
+// Double vipcontinuingMember = JSON.parseObject(discount.getContent()).getDouble("continuingMember");
+//
+//
+// if (coursePackagePaymentConfigVo.getPaymentPrice() > continuingMember) {
+// coursePackagePaymentConfigVo.setPaymentPrice(continuingMember);
+// }
+// if (coursePackagePaymentConfigVo.getVipPrice() > vipcontinuingMember) {
+// coursePackagePaymentConfigVo.setVipPrice(vipcontinuingMember);
+// }
if (coursePackagePaymentConfigVo.getPaymentPrice() < coursePackagePaymentConfigVo.getVipPrice()) {
diff --git a/cloud-server-management/src/main/java/com/dsh/course/entity/CoursePackageOrderStudent.java b/cloud-server-management/src/main/java/com/dsh/course/entity/CoursePackageOrderStudent.java
new file mode 100644
index 0000000..52b76d7
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/course/entity/CoursePackageOrderStudent.java
@@ -0,0 +1,94 @@
+package com.dsh.course.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/11/25 11:59
+ */
+@Data
+@TableName("t_course_package_order_student")
+public class CoursePackageOrderStudent {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+ /**
+ * 用户id
+ */
+ @TableField("appUserId")
+ private Integer appUserId;
+ /**
+ * 学员id
+ */
+ @TableField("studentId")
+ private Integer studentId;
+ /**
+ * 课包id
+ */
+ @TableField("coursePackageId")
+ private Integer coursePackageId;
+ /**
+ * 总课时
+ */
+ @TableField("totalClassHours")
+ private Integer totalClassHours;
+ /**
+ * 剩余课时
+ */
+ @TableField("laveClassHours")
+ private Integer laveClassHours;
+ /**
+ * 缺课次数
+ */
+ @TableField("absencesNumber")
+ private Integer absencesNumber;
+ /**
+ * 退课课时
+ */
+ @TableField(exist = false)
+ private Integer dropoutsNumber;
+ /**
+ * 课程状态（1=正常，2=已退课）
+ */
+ @TableField("status")
+ private Integer status;
+ /**
+ * 退课时间
+ */
+ @TableField("withdrawalTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date withdrawalTime;
+ /**
+ * 退课凭证
+ */
+ @TableField("certificate")
+ private String certificate;
+ /**
+ * 状态（1=正常，2=冻结，3=删除）
+ */
+ @TableField("state")
+ private Integer state;
+ /**
+ * 添加时间
+ */
+ @TableField("insertTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date insertTime;
+ /**
+ * 赠送课时
+ */
+ @TableField("giftClassHours")
+ private Integer giftClassHours;
+ /**
+ * 课程有效期
+ */
+ @TableField("useTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date useTime;
+}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java
index ebe104f..8504df7 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java
@@ -1,6 +1,10 @@
package com.dsh.course.feignClient.course;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsh.course.entity.CoursePackageOrderStudent;
+import com.dsh.course.feignClient.course.model.QueryRegistrationRecord;
+import com.dsh.course.feignClient.course.model.QueryWalkInStudentList;
+import com.dsh.course.feignClient.course.model.TCoursePackage;
import com.dsh.course.feignClient.course.model.*;
import com.dsh.course.feignClient.course.model.TCoursePackagePayment;
import com.dsh.guns.modular.system.model.*;
@@ -85,6 +89,10 @@
@PostMapping("/coursePackagePayment/consumeCourse")
ResultUtil consumeCourse(@RequestBody Integer coursePackagePaymentId);
+ @PostMapping("/coursePackagePayment/queryCoursePackagePaymentById1")
+ CoursePackageOrderStudent queryCoursePackagePaymentById1(@RequestParam("id")Long id);
+
+
/**
* 修改数据
* @param coursePackagePayment
@@ -95,6 +103,9 @@
@PostMapping("/coursePackagePayment/editCoursePackagePayment1")
void editCoursePackagePayment1(@RequestBody TCoursePackagePayment coursePackagePayment);
+ @PostMapping("/coursePackagePayment/editCoursePackagePayment2")
+ void editCoursePackagePayment2(@RequestBody CoursePackageOrderStudent coursePackageOrderStudent);
+
@PostMapping("/coursePackagePayment/CountqueryByClassId")
Integer queryByClassId(Integer id);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java
index 9b70316..1f3af00 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java
@@ -16,6 +16,7 @@
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.modular.system.model.*;
+import com.dsh.course.entity.CoursePackageOrderStudent;
import com.dsh.guns.modular.system.model.TCoursePackagePayment;
import com.dsh.guns.modular.system.model.dto.CoursePackage;
import com.dsh.guns.modular.system.service.ICityService;
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
index 5d58749..05b26cf 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsh.course.entity.CoursePackageOrderStudent;
import com.dsh.course.feignClient.course.*;
import com.dsh.course.feignClient.course.model.*;
import com.dsh.guns.config.UserExt;
@@ -548,48 +549,53 @@
@Override
public ResultUtil cancellationRecord(Long id, String cancelClasses, Integer deductClassHour) {
// CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingClient.queryCoursePackageSchedulingById(id);
- List<Long> integers = new ArrayList<>();
+
List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingClient.queryCoursePackageSchedulingsById(id);
+ List<Long> integers = new ArrayList<>();
+ for (CoursePackageScheduling coursePackageScheduling : coursePackageSchedulings) {
+ integers.add(coursePackageScheduling.getId());
+ coursePackageScheduling.setCancelClasses(cancelClasses);
+ coursePackageScheduling.setDeductClassHour(deductClassHour);
+ }
+
+
// for (CoursePackageScheduling coursePackageScheduling : coursePackageSchedulings) {
+
// if(coursePackageScheduling.getStatus() == 1 || coursePackageScheduling.getStatus() == 4){
// return ResultUtil.error("不能添加消课凭证");
// }
// coursePackageScheduling.setCancelClasses(cancelClasses);
// coursePackageScheduling.setDeductClassHour(deductClassHour);
+ coursePackageSchedulingClient.editCoursePackageScheduling(coursePackageSchedulings);
+
List<CoursePackageStudent> coursePackageStudents = coursePackageStudentClient.queryByCoursePackageSchedulingId(integers);
for (CoursePackageStudent coursePackageStudent : coursePackageStudents) {
- for (CoursePackageScheduling coursePackageScheduling : coursePackageSchedulings) {
- if (coursePackageStudent.getSignInOrNot()==2){
- break;
- }
- integers.add(coursePackageScheduling.getId());
- coursePackageScheduling.setCancelClasses(cancelClasses);
- coursePackageScheduling.setDeductClassHour(deductClassHour);
- }
-
if(coursePackageStudent.getReservationStatus() == 0){
continue;
}
- TCoursePackagePayment tCoursePackagePayment = coursePackagePaymentClient.queryCoursePackagePaymentById(coursePackageStudent.getCoursePackagePaymentId());
+// TCoursePackagePayment tCoursePackagePayment = coursePackagePaymentClient.queryCoursePackagePaymentById(coursePackageStudent.getCoursePackagePaymentId());
+
+ CoursePackageOrderStudent coursePackageOrderStudent = coursePackagePaymentClient.queryCoursePackagePaymentById1(coursePackageStudent.getCoursePackagePaymentId());
if (deductClassHour!=null) {
- if (tCoursePackagePayment.getLaveClassHours() - deductClassHour < 0) {
+ if (coursePackageOrderStudent.getLaveClassHours() - deductClassHour < 0) {
coursePackageStudentClient.editCoursePackageStudent(coursePackageStudent);
continue;
}
- tCoursePackagePayment.setLaveClassHours(tCoursePackagePayment.getLaveClassHours() - deductClassHour);
+ coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours() - deductClassHour);
}
if(coursePackageStudent.getReservationStatus() == 0){
- tCoursePackagePayment.setAbsencesNumber(tCoursePackagePayment.getAbsencesNumber() + 1);
+ coursePackageOrderStudent.setAbsencesNumber(coursePackageOrderStudent.getAbsencesNumber() + 1);
}
- System.out.println("====tCoursePackagePayment====="+tCoursePackagePayment);
- coursePackagePaymentClient.editCoursePackagePayment1(tCoursePackagePayment);
+ System.out.println("====tCoursePackagePayment====="+coursePackageOrderStudent);
+ coursePackagePaymentClient.editCoursePackagePayment2(coursePackageOrderStudent);
+
CancelledClasses cancelledClasses = new CancelledClasses();
cancelledClasses.setType(1);
cancelledClasses.setCoursePackageId(coursePackageStudent.getCoursePackageId());
- cancelledClasses.setCoursePackagePaymentId(coursePackageStudent.getCoursePackagePaymentId());
+ cancelledClasses.setCoursePackagePaymentId(coursePackageOrderStudent.getId());
cancelledClasses.setCoursePackageSchedulingId(coursePackageStudent.getCoursePackageSchedulingId());
cancelledClasses.setVoucher(cancelClasses);
if (deductClassHour!=null) {
@@ -603,7 +609,6 @@
}
- coursePackageSchedulingClient.editCoursePackageScheduling(coursePackageSchedulings);
// }
return ResultUtil.success();
--
Gitblit v1.7.1