From 852681bc9257e9eaae64d027a9bc6d88f93f35b4 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期六, 23 九月 2023 09:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java | 23 +++++++++++++++++++----
1 files changed, 19 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 b5e5e0b..9d6d07e 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,11 +1,16 @@
package com.dsh.account.feignclient.course;
+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")
@@ -13,7 +18,7 @@
@PostMapping("/base/coursePack/queryPayment")
- List<StuCourseResp> getStuCoursePayment();
+ List<StuCourseResp> getStuCoursePayment(@RequestBody Integer stuId);
@PostMapping("/base/coursePack/storeOfCourse")
@@ -32,7 +37,7 @@
List<PurchaseVo> getAppUsersCourseData(@RequestBody Integer appUserId);
@PostMapping("/base/coursePack/allPaymentCourseList")
- public List<TCoursePackagePayment> getAppuserCourseList(@RequestBody Integer appUserId);
+ public List<CouponPaymentVo> getAppuserCourseList(@RequestBody Integer appUserId);
@PostMapping("/coursePackagePayment/courseRenewPlayPaiPay")
public int paymentWanpaiRenewCourse(@RequestBody PlayPaiGoldCoursePackage coursePackage);
@@ -50,13 +55,23 @@
public boolean savePaymentCoursePackage(@RequestBody TCoursePackagePayment packagePayment);
@PostMapping("/base/coursePack/allAmountPayRecordOfUser")
- public List<TCoursePackagePayment> getAmountPayRecord(@RequestBody Integer appUserId);
+ BillingRequestVo getAmountPayRecord(@RequestBody BillingDataRequestVo appUserId);
@PostMapping("/base/coursePack/obtainStudentClassDetails")
- List<RecordAppoint> obtainStudentClassDetailsData(@RequestBody Integer stuId);
+ List<RecordAppoint> obtainStudentClassDetailsData(@RequestBody WeeksOfCourseRest stuId);
@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