From fc5fcf753994834a72564944c117d5ec850f268c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 31 七月 2023 19:08:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 85230c2..4d41f52 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
@@ -97,6 +97,7 @@
* @param stuId 学员id
* @return 课包列表
*/
+ @ResponseBody
@PostMapping("/base/coursePack/queryPayment")
public List<StuCourseResp> getStuCoursePackagePayment(@RequestBody Integer stuId){
Integer userIdFormRedis = null;
@@ -119,6 +120,8 @@
resp.setTotalCourseNums(tCoursePackagePayment.getTotalClassHours());
resp.setResidueNums(tCoursePackagePayment.getLaveClassHours());
resp.setDeductionNums(tCoursePackagePayment.getTotalClassHours()-tCoursePackagePayment.getLaveClassHours());
+ String afterDayDate = DateUtil.getAfterDayDate2(tCoursePackage.getInsertTime(),tCoursePackage.getValidDays() + "");
+ resp.setPeriodOfValidity(afterDayDate);
resps.add(resp);
}
}
@@ -129,6 +132,7 @@
*
* 获取发布的 课包列表
*/
+ @ResponseBody
@PostMapping("/base/coursePack/storeOfCourse")
public List<CourseOfStoreVo> getStuCourseWithStores(@RequestBody WeeksOfCourseRest courseRest){
List<CourseOfStoreVo> course = new ArrayList<>();
@@ -377,12 +381,13 @@
}
@PostMapping("/base/coursePack/allAmountPayRecordOfUser")
- public List<TCoursePackagePayment> getAmountPayRecord(@RequestBody Integer appUserId){
+ public List<TCoursePackagePayment> getAmountPayRecord(@RequestBody BillingDataRequestVo billingDataRequestVo){
return packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>()
- .eq("appUserId",appUserId)
+ .eq("appUserId",billingDataRequestVo.getAppUserId())
.notIn("payType",3)
.eq("payStatus",2)
- .eq("state",1));
+ .eq("state",1)
+ .between("insertTime",billingDataRequestVo.getMonthStart(),billingDataRequestVo.getMonthEnd()));
}
--
Gitblit v1.7.1