From f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 20:03:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 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 a0a75a8..18393df 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,12 +1,17 @@
package com.dsh.account.feignclient.course;
+import com.dsh.account.dto.TCoursePackagePayment1;
import com.dsh.account.feignclient.competition.model.BillingDataRequestVo;
import com.dsh.account.feignclient.course.model.*;
+import com.dsh.account.model.BillingRequest;
+import com.dsh.account.model.BillingRequestVo;
+import com.dsh.account.model.vo.DetailsListVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+import java.util.HashMap;
import java.util.List;
@FeignClient(value = "mb-cloud-course")
@@ -44,6 +49,14 @@
@PostMapping("/base/coursePack/delPaymentCoursePackage")
public boolean delPaymentCoursePackage(@RequestBody Integer payId);
+
+ @PostMapping("/base/coursePack/getCoursePackagePaymentById")
+ 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);
@@ -51,7 +64,7 @@
public boolean savePaymentCoursePackage(@RequestBody TCoursePackagePayment packagePayment);
@PostMapping("/base/coursePack/allAmountPayRecordOfUser")
- public List<TCoursePackagePayment> getAmountPayRecord(@RequestBody BillingDataRequestVo appUserId);
+ BillingRequestVo getAmountPayRecord(@RequestBody BillingDataRequestVo appUserId);
@PostMapping("/base/coursePack/obtainStudentClassDetails")
List<RecordAppoint> obtainStudentClassDetailsData(@RequestBody WeeksOfCourseRest stuId);
@@ -60,4 +73,14 @@
@PostMapping("/base/coursePack/getCoursePackagePaymentOfCode")
List<TCoursePackagePayment> getCoursePackagePaymentOfCode(@RequestBody String code);
+ @PostMapping("/base/coursePack/sendHours")
+ Integer sendHours(String s);
+
+ @PostMapping("/base/coursePack/getClassHour")
+ Integer getClassHour(Integer courseConfigId);
+
+ @PostMapping("/base/coursePack/weeksOfCourseDetailsList")
+ HashMap<String, Object> weeksOfCourseDetailsList(@RequestBody CourseDetailReq courseDetailReq);
+
+
}
--
Gitblit v1.7.1