From 3c12858927ce26f277ba758e520c81be599d8df1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 15:42:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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..8504df7 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.*;
@@ -87,6 +89,10 @@
@PostMapping("/coursePackagePayment/consumeCourse")
ResultUtil consumeCourse(@RequestBody Integer coursePackagePaymentId);
+ @PostMapping("/coursePackagePayment/queryCoursePackagePaymentById1")
+ CoursePackageOrderStudent queryCoursePackagePaymentById1(@RequestParam("id")Long id);
+
+
/**
* 修改数据
* @param coursePackagePayment
@@ -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