From 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 21 一月 2025 18:15:00 +0800
Subject: [PATCH] 合并代码
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java
index 2c74ad5..936321b 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java
@@ -37,7 +37,7 @@
List<AfterVideoVo> getAfterCourseTwos(@RequestParam("appUserId") Integer appUserId);
@PostMapping("/base/coursePack/courseOfPurchased")
- List<PurchaseVo> getAppUsersCourseData(@RequestBody Integer appUserId);
+ List<PurchaseVo> getAppUsersCourseData(@RequestBody Integer appUserId);
@PostMapping("/base/coursePack/allPaymentCourseList")
public List<CouponPaymentVo> getAppuserCourseList(@RequestBody Integer appUserId);
@@ -63,7 +63,7 @@
void updatePaymentCoursePackage(@RequestBody TCoursePackagePayment coursePackagePayment);
@PostMapping("/base/coursePack/savePaymentCoursePackage")
- public boolean savePaymentCoursePackage(@RequestBody TCoursePackagePayment packagePayment);
+ Long savePaymentCoursePackage(@RequestBody CoursePackageOrder coursePackageOrder);
@PostMapping("/base/coursePack/orderClass")
@@ -80,7 +80,7 @@
List<TCoursePackagePayment> getCoursePackagePaymentOfCode(@RequestBody String code);
@PostMapping("/base/coursePack/sendHours")
- Integer sendHours(String s);
+ Integer sendHours(@RequestBody String s);
@PostMapping("/base/coursePack/getClassHour")
Integer getClassHour(Integer courseConfigId);
@@ -96,5 +96,22 @@
// Integer getClassHour(Integer courseConfigId);
+ @PostMapping("/course/addCoursePackageOrderStudent")
+ void addCoursePackageOrderStudent(@RequestBody AddCoursePackageOrderStudent addCoursePackageOrderStudent);
+
+ @PostMapping("/course/getCoursePackageOrderByCode")
+ CoursePackageOrder getCoursePackageOrderByCode(@RequestBody String code);
+
+
+ @PostMapping("/course/updateCoursePackageOrder")
+ void updateCoursePackageOrder(@RequestBody CoursePackageOrder coursePackageOrder);
+
+
+ @PostMapping("/course/getCoursePackagePaymentConfig")
+ CoursePackagePaymentConfig getCoursePackagePaymentConfig(@RequestBody GetCoursePackagePaymentConfig getCoursePackagePaymentConfig);
+
+
+ @PostMapping("/base/coursePack/getCoursePackageOrder")
+ List<CoursePackageOrder> getCoursePackageOrder(@RequestBody BillingDataRequestVo requestVo);
}
--
Gitblit v1.7.1