From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java
index 5c5d4e3..09e19f9 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java
@@ -1,12 +1,14 @@
package com.dsh.course.feignClient.course;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsh.course.entity.CoursePackageOrderStudent;
import com.dsh.course.feignClient.course.model.QueryRegistrationRecord;
import com.dsh.course.feignClient.course.model.QueryWalkInStudentList;
import com.dsh.course.feignClient.course.model.TCoursePackage;
+import com.dsh.course.feignClient.course.model.*;
import com.dsh.course.feignClient.course.model.TCoursePackagePayment;
import com.dsh.guns.modular.system.model.*;
-import com.dsh.guns.modular.system.model.dto.CoursePackage;
+
import com.dsh.guns.modular.system.util.ResultUtil;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -85,7 +87,11 @@
@PostMapping("/coursePackagePayment/consumeCourse")
- ResultUtil consumeCourse(@RequestBody Integer coursePackagePaymentId);
+ Integer consumeCourse(@RequestBody Integer coursePackagePaymentId);
+
+ @PostMapping("/coursePackagePayment/queryCoursePackagePaymentById1")
+ CoursePackageOrderStudent queryCoursePackagePaymentById1(@RequestParam("id")Long id);
+
/**
* 修改数据
@@ -96,6 +102,9 @@
@PostMapping("/coursePackagePayment/editCoursePackagePayment1")
void editCoursePackagePayment1(@RequestBody TCoursePackagePayment coursePackagePayment);
+
+ @PostMapping("/coursePackagePayment/editCoursePackagePayment2")
+ void editCoursePackagePayment2(@RequestBody CoursePackageOrderStudent coursePackageOrderStudent);
@PostMapping("/coursePackagePayment/CountqueryByClassId")
@@ -112,5 +121,6 @@
HashMap<String, Object> courseStore(@RequestBody List<Integer> userPt);
@GetMapping("/coursePackagePayment/courseStore/{appUserId}/{coursePackageId}")
- List<TCoursePackagePayment> getByUserIdAndCoursePackageId(@PathVariable("appUserId") Integer appUserId,@PathVariable("coursePackageId") Integer coursePackageId);
+ List<CoursePackageOrderStudent> getByUserIdAndCoursePackageId
+ (@PathVariable("appUserId") Integer appUserId, @PathVariable("coursePackageId") Integer coursePackageId);
}
--
Gitblit v1.7.1