From b23b243473fc9ab20ca62eebf3668c143e2e7d23 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 15:30:53 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 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 d035236..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
@@ -1,5 +1,8 @@
package com.dsh.account.feignclient.course;
+import com.dsh.account.dto.TCoursePackagePayment1;
+import com.dsh.account.entity.CourseCounsum;
+import com.dsh.account.entity.OrderDto;
import com.dsh.account.feignclient.competition.model.BillingDataRequestVo;
import com.dsh.account.feignclient.course.model.*;
import com.dsh.account.model.BillingRequest;
@@ -34,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);
@@ -50,13 +53,21 @@
@PostMapping("/base/coursePack/getCoursePackagePaymentById")
- public TCoursePackagePayment getCoursePackagePaymentById(@RequestBody Integer id);
+ public TCoursePackagePayment getCoursePackagePaymentById(@RequestBody Long id);
+
+
+ @PostMapping("/base/coursePack/getCoursePackagePaymentById")
+ public TCoursePackagePayment1 getCoursePackagePaymentById1(@RequestBody Long id);
@PostMapping("/base/coursePack/updatePaymentCoursePackage")
void updatePaymentCoursePackage(@RequestBody TCoursePackagePayment coursePackagePayment);
@PostMapping("/base/coursePack/savePaymentCoursePackage")
- public boolean savePaymentCoursePackage(@RequestBody TCoursePackagePayment packagePayment);
+ Long savePaymentCoursePackage(@RequestBody CoursePackageOrder coursePackageOrder);
+
+
+ @PostMapping("/base/coursePack/orderClass")
+ public void orderClass(@RequestBody OrderDto orderDto);
@PostMapping("/base/coursePack/allAmountPayRecordOfUser")
BillingRequestVo getAmountPayRecord(@RequestBody BillingDataRequestVo appUserId);
@@ -69,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);
@@ -77,5 +88,30 @@
@PostMapping("/base/coursePack/weeksOfCourseDetailsList")
HashMap<String, Object> weeksOfCourseDetailsList(@RequestBody CourseDetailReq courseDetailReq);
+ @PostMapping("/base/coursePack/getConsumes")
+ List<CourseCounsum> getConsumes(@RequestBody BillingDataRequestVo requestVo);
+
+// @PostMapping("/base/coursePack/getClassHour")
+// 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