From 60ef8b4a95540dfab9df0447364ee40c18354010 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 04 七月 2023 08:48:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 6bb7506..0f0c56f 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.account.entity.TAppUser;
import com.dsh.account.entity.TStudent;
-import com.dsh.account.enums.WeeksEnum;
import com.dsh.account.feignclient.course.CoursePaymentClient;
import com.dsh.account.feignclient.course.model.CourseOfStoreVo;
import com.dsh.account.feignclient.course.model.QueryStoreList;
@@ -30,6 +29,7 @@
import com.dsh.account.util.akeylogin.Md5Util;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -88,6 +88,7 @@
.eq("isDefault",1));
if (tStudents.size() > 0 ){
TStudent tStudent = tStudents.get(0);
+ classInfoVo.setStuId(tStudent.getId());
classInfoVo.setIsThere(1);
classInfoVo.setStuImg(tStudent.getHeadImg());
classInfoVo.setStuSex(tStudent.getSex());
@@ -147,21 +148,11 @@
* @param latitude
* @return
*/
- public List<WeekedCourse> dealDatas(List<CourseOfStoreVo> storeOfCourses,String longitude ,String latitude){
+ public List<WeekedCourse> dealDatas(List<CourseOfStoreVo> storeOfCourses,String longitude ,@RequestBody String latitude){
List<WeekedCourse> weekedCourses = new ArrayList<>();
- int weekStr = LocalDateTimeUtils.getWeekStr();
for (int i = 1; i < 8; i++) {
WeekedCourse weekedCourse = new WeekedCourse();
- weekedCourse.setWeekNum(i);
- weekedCourse.setWeekStr(WeeksEnum.getStr(i));
- String weekOfDays = LocalDateTimeUtils.getWeekOfDays(i);
- weekedCourse.setDayStr(weekOfDays);
List<CourseVenue> courseVenues = new ArrayList<>();
- if (weekStr == i) {
- weekedCourse.setIsToday(1);
- } else {
- weekedCourse.setIsToday(2);
- }
Map<Integer, List<CourseOfStoreVo>> map = storeOfCourses.stream().collect(Collectors.groupingBy(CourseOfStoreVo::getStoreId));
for (Map.Entry<Integer, List<CourseOfStoreVo>> integerListEntry : map.entrySet()) {
List<CourseOfStoreVo> value = integerListEntry.getValue();
--
Gitblit v1.7.1