From 7aa9607492e2c0b70838c53083f5362e49e74f44 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 26 九月 2023 21:39:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
index 2d6993a..707bea3 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
@@ -71,7 +71,7 @@
@PostMapping("/student/queryDefaultStudent")
public TStudent queryDefaultStudent(@RequestBody Integer appUserId){
try {
- TStudent one = studentService.getOne(new QueryWrapper<TStudent>().eq("appUserId", appUserId).eq("isDefault", 1).eq("state", 1));
+ TStudent one = studentService.getOne(new QueryWrapper<TStudent>().eq("appUserId", appUserId).eq("isDefault", 1).eq("state", 1).last("limit 1"));
return one;
}catch (Exception e){
e.printStackTrace();
@@ -213,7 +213,7 @@
System.out.println("======giftSelect=========giftSearchDto===="+giftSearchDto);
// Integer appId = studentService.getGiftSelect(giftSearchDto);
- TCoursePackagePayment coursePackagePaymentById = paymentClient.getCoursePackagePaymentById(giftSearchDto.getId());
+ TCoursePackagePayment1 coursePackagePaymentById = paymentClient.getCoursePackagePaymentById1(giftSearchDto.getId());
// System.out.println("=======giftSelect======appId====>"+appId);
List<TStudent> selectDtos = studentService.list(new QueryWrapper<TStudent>()
.select("name, id")
--
Gitblit v1.7.1