From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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..1ec8a0c 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;
@@ -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);
+
+
+ @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,13 @@
@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);
+
+
}
--
Gitblit v1.7.1