From 135aeb3706b445d6d1a937168a0fe781cf3060a8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 14:47:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 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 61a8c62..c08af8a 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,14 +1,19 @@
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;
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")
@@ -32,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);
@@ -46,11 +51,23 @@
@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);
@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);
@@ -62,4 +79,21 @@
@PostMapping("/base/coursePack/getCoursePackagePaymentOfCode")
List<TCoursePackagePayment> getCoursePackagePaymentOfCode(@RequestBody String code);
+ @PostMapping("/base/coursePack/sendHours")
+ Integer sendHours(@RequestBody String s);
+
+ @PostMapping("/base/coursePack/getClassHour")
+ Integer getClassHour(Integer courseConfigId);
+
+ @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