From 4ee77a0ee732b1d760b08d986ab308dc8d89f6be Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 01 十一月 2023 10:43:54 +0800
Subject: [PATCH] 支付会员购买bug
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
index 0e0d9d9..2bee448 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
@@ -291,6 +291,10 @@
if(timeRequest.getType()!=null){
eq.eq(TCourseInfoRecord::getType,timeRequest.getType());
}
+ if (timeRequest.getLessionId()!=null){
+ eq.eq(TCourseInfoRecord::getCourseId,timeRequest.getLessionId());
+
+ }
// 2.0其他记录
List<TCourseInfoRecord> list = courseInfoRecordService.list(eq);
List<PurchaseRecordVo> list1=new ArrayList<>();
@@ -313,15 +317,15 @@
String fieldValue = record.getPurchaseAmount();
if (ToolUtil.isNotEmpty(timeRequest.getType())){
switch (timeRequest.getType()){
- case 1:
- return fieldValue != null && !fieldValue.isEmpty() && fieldValue.charAt(0) == '-';
case 2:
+ return fieldValue != null && !fieldValue.isEmpty() && fieldValue.charAt(0) == '-';
+ case 1:
return fieldValue != null && !fieldValue.isEmpty() && fieldValue.charAt(0) == '+';
default:
break;
}
}
- return false;
+ return true;
})
.collect(Collectors.toList());
}
@@ -651,10 +655,11 @@
* @return
*/
@Override
- public List<RecordAppoint> getAppointmentRecords(Integer stuId, Integer appUserId,Integer appointStatus,Integer timeType,String search) {
+ public List<RecordAppoint> getAppointmentRecords(Integer stuId, Integer appUserId,Integer appointStatus,Integer timeType,String search,Integer pageNum) {
WeeksOfCourseRest courseRest = new WeeksOfCourseRest();
courseRest.setAppUserId(appUserId);
courseRest.setStuId(stuId);
+ courseRest.setPageNum(pageNum);
List<RecordAppoint> recordAppoints = couPayClient.obtainStudentClassDetailsData(courseRest);
if (recordAppoints.size() > 0) {
if (ToolUtil.isNotEmpty(appointStatus) && appointStatus != 0) {
@@ -787,7 +792,7 @@
detailsVo.setLon(store.getLon());
detailsVo.setLat(store.getLat());
detailsVo.setPhone(store.getPhone());
- detailsVo.setVenueList(steClient.getAppUserSiteList());
+ detailsVo.setVenueList(steClient.getAppUserSiteList(storeId));
List<StoreOfCourseVo> storeOfCourseList = culisClient.getStoreOfCourseList(storeId);
System.out.println(storeOfCourseList);
detailsVo.setCourseVoList(storeOfCourseList);
--
Gitblit v1.7.1