From 0d998afc5dd5a41851e34d8b8b742e4934e6fd62 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期四, 03 八月 2023 18:04:21 +0800
Subject: [PATCH] 修复app端加入玩湃中课程列表数据字段bug；使用福利的课时详情的记录bug
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 146 ++++++++++++++++++++++++++++++++----------------
1 files changed, 97 insertions(+), 49 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 6f670d5..d492a5e 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
@@ -36,10 +36,12 @@
import com.dsh.account.model.vo.sourceDetail.CouponStuAvailableVo;
import com.dsh.account.model.vo.sourceDetail.CourseDetailsOfContinuationResp;
import com.dsh.account.model.vo.sourceDetail.RecordTimeRequest;
+import com.dsh.account.model.vo.userBenefitDetail.Goods;
import com.dsh.account.service.TStudentService;
import com.dsh.account.util.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -203,9 +205,9 @@
getStuOfCoursesDetails.setStuId(stuId);
getStuOfCoursesDetails.setAppUserId(userIdFormRedis);
StuWithCoursesListVo stuOfCoursesDetails = couPayClient.getStuOfCoursesDetails(getStuOfCoursesDetails);
- insVo.setTotalNums(stuOfCoursesDetails.getTotalNums());
- insVo.setDeductedNums(stuOfCoursesDetails.getDeductedNums());
- insVo.setRemainingNums(stuOfCoursesDetails.getRemainingNums());
+ insVo.setTotalNums(ToolUtil.isEmpty(stuOfCoursesDetails.getTotalNums()) ? 0 : stuOfCoursesDetails.getTotalNums());
+ insVo.setDeductedNums(ToolUtil.isEmpty(stuOfCoursesDetails.getDeductedNums()) ? 0 : stuOfCoursesDetails.getDeductedNums());
+ insVo.setRemainingNums(ToolUtil.isEmpty(stuOfCoursesDetails.getRemainingNums()) ? 0 : stuOfCoursesDetails.getRemainingNums());
GetStudentCourse course = new GetStudentCourse();
course.setCourseId(lessonId);
course.setStuId(stuId);
@@ -220,9 +222,20 @@
@Override
public List<PurchaseRecordVo> queryDeduRecordDetails(RecordTimeRequest timeRequest,Integer appUserId) {
List<PurchaseRecordVo> purchaseRecordVoList = new ArrayList<>();
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- Date startTime = DateTimeHelper.getCurrentIdetMouthStart(timeRequest.getStartTime());
- Date endTime = DateTimeHelper.getCurrentIdeaMouthEnd(timeRequest.getEndTime());
+ String time = timeRequest.getTime();
+ Date monthStart = null;
+ Date monthEnd = null;
+ if (StringUtils.hasText(time)) {
+ monthStart = DateTimeHelper.getCurrentIdetMouthStart(time);
+ monthEnd = DateTimeHelper.getCurrentIdeaMouthEnd(time);
+ } else {
+ monthStart = DateTimeHelper.getCurrentMouthStart();
+ monthEnd = DateTimeHelper.getCurrentMouthEnd();
+ }
+
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM");
+ Date startTime = DateTimeHelper.getCurrentIdetMouthStart(simpleDateFormat.format(monthStart));
+ Date endTime = DateTimeHelper.getCurrentIdeaMouthEnd(simpleDateFormat.format(monthEnd));
GetStuSourseList getStuSourseList = new GetStuSourseList();
getStuSourseList.setStartTime(startTime);
getStuSourseList.setEndTime(endTime);
@@ -595,65 +608,79 @@
if (ToolUtil.isNotEmpty(tStudent)){
recordVo.setStuId(tStudent.getId());
recordVo.setStuName(tStudent.getName());
- List<RecordAppoint> recordAppoints = couPayClient.obtainStudentClassDetailsData(stuId);
+ WeeksOfCourseRest courseRest = new WeeksOfCourseRest();
+ courseRest.setAppUserId(appUserId);
+ courseRest.setStuId(stuId);
+ List<RecordAppoint> recordAppoints = couPayClient.obtainStudentClassDetailsData(courseRest);
if (ToolUtil.isEmpty(appointStatus)){
recordVo.setAppointStatus(0);
}else {
recordVo.setAppointStatus(appointStatus);
- recordAppoints = recordAppoints.stream()
- .filter(record -> record.getStatus().equals(appointStatus))
- .collect(Collectors.toList());
+ if (recordAppoints.size() > 0 ){
+ recordAppoints = recordAppoints.stream()
+ .filter(record -> record.getStatus().equals(appointStatus))
+ .collect(Collectors.toList());
+ }
}
if (ToolUtil.isNotEmpty(search)){
recordVo.setAppointStatus(appointStatus);
- recordAppoints = recordAppoints.stream()
- .filter(record -> record.getCoursePackageName().contains(search))
- .collect(Collectors.toList());
+ if (recordAppoints.size() > 0 ){
+ recordAppoints = recordAppoints.stream()
+ .filter(record -> record.getCoursePackageName().contains(search))
+ .collect(Collectors.toList());
+ }
}
if (ToolUtil.isNotEmpty(timeType)){
Date lastOfDate = DateUtil.getLastOfDate();
switch (timeType){
case 1:
Date lastWeekStartDate = DateUtil.getLastWeekStartDate();
- recordAppoints = recordAppoints.stream()
- .filter(record -> {
- try {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- Date time = sdf.parse(record.getTimeFrame().substring(11));
- return !time.before(lastWeekStartDate) && !time.after(lastOfDate);
- } catch (ParseException e) {
- return false;
- }
- })
- .collect(Collectors.toList());
+ if (recordAppoints.size() > 0 ){
+ recordAppoints = recordAppoints.stream()
+ .filter(record -> {
+ try {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date time = sdf.parse(record.getTimeFrame().substring(11));
+ return !time.before(lastWeekStartDate) && !time.after(lastOfDate);
+ } catch (ParseException e) {
+ return false;
+ }
+ })
+ .collect(Collectors.toList());
+ }
break;
case 2:
Date lastMonthStartDate = DateUtil.getLastMonthStartDate();
- recordAppoints = recordAppoints.stream()
- .filter(record -> {
- try {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- Date time = sdf.parse(record.getTimeFrame().substring(11));
- return !time.before(lastMonthStartDate) && !time.after(lastOfDate);
- } catch (ParseException e) {
- return false;
- }
- })
- .collect(Collectors.toList());
+ if (recordAppoints.size() > 0 ){
+ recordAppoints = recordAppoints.stream()
+ .filter(record -> {
+ try {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ Date time = sdf.parse(record.getTimeFrame().substring(11));
+ return !time.before(lastMonthStartDate) && !time.after(lastOfDate);
+ } catch (ParseException e) {
+ return false;
+ }
+ })
+ .collect(Collectors.toList());
+ }
break;
case 3:
Date lastYearStartDate = DateUtil.getLastYearStartDate();
- recordAppoints = recordAppoints.stream()
- .filter(record -> {
- try {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- Date time = sdf.parse(record.getTimeFrame().substring(11));
- return !time.before(lastYearStartDate) && !time.after(lastOfDate);
- } catch (ParseException e) {
- return false;
- }
- })
- .collect(Collectors.toList());
+ if (recordAppoints.size() > 0 ){
+ recordAppoints = recordAppoints.stream()
+ .filter(record -> {
+ try {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date time = sdf.parse(record.getTimeFrame().substring(11));
+ return !time.before(lastYearStartDate) && !time.after(lastOfDate);
+ } catch (ParseException e) {
+ return false;
+ }
+ })
+ .collect(Collectors.toList());
+ }
+
break;
default:
break;
@@ -682,14 +709,35 @@
return null;
}
+ /**
+ *
+ * @param space 1=升序/2=降序
+ * @param cityCode 城市code
+ * @param latitude
+ * @param longitude
+ * @return
+ */
@Override
- public List<StoreDetailList> queryStoreList(Integer space,String cityCode,String latitude,String longitude) {
+ public List<StoreDetailList> queryStoreList(Integer space,String cityCode,String latitude,String longitude,String search) {
StoreOfCitycodeResp citycodeResp = new StoreOfCitycodeResp();
- citycodeResp.setSpace(space);
citycodeResp.setCityCode(cityCode);
citycodeResp.setLongitude(latitude);
citycodeResp.setLatitude(longitude);
- return storeClient.getQueryStoreList(citycodeResp);
+ List<StoreDetailList> queryStoreList = storeClient.getQueryStoreList(citycodeResp);
+ if (queryStoreList.size() > 0){
+ if (ToolUtil.isEmpty(space) || space == 2){
+ queryStoreList = queryStoreList.stream()
+ .sorted(Comparator.comparing(StoreDetailList::getStoreDistance).reversed())
+ .collect(Collectors.toList());
+ }else {
+ queryStoreList = queryStoreList.stream().sorted(Comparator.comparing(o -> o.getStoreDistance())).collect(Collectors.toList());
+ }
+ if (ToolUtil.isNotEmpty(search)){
+ queryStoreList = queryStoreList.stream().filter(o -> o.getStoreName().contains(search)).collect(Collectors.toList());
+ }
+
+ }
+ return queryStoreList;
}
@Override
--
Gitblit v1.7.1