From d061aa842106480f3a8991d83dc3b978441330ab Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期四, 06 七月 2023 17:52:00 +0800
Subject: [PATCH] 修改续课详情页面的支付方式展示；开始上课-课后练习接口开发
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 187 +++++++++++++++++++++++++++++++++-------------
1 files changed, 132 insertions(+), 55 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 2d198db..13c01eb 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,30 +5,40 @@
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.activity.MerChandiseClient;
import com.dsh.account.feignclient.course.CoursePaymentClient;
import com.dsh.account.feignclient.course.model.CourseOfStoreVo;
+import com.dsh.account.feignclient.course.model.PurchaseVo;
+import com.dsh.account.feignclient.course.model.QueryStoreList;
import com.dsh.account.feignclient.course.model.StuCourseResp;
import com.dsh.account.feignclient.other.ImgConfigClient;
+import com.dsh.account.feignclient.other.StoreClient;
+import com.dsh.account.feignclient.other.model.Store;
import com.dsh.account.feignclient.other.model.TImgConfig;
import com.dsh.account.mapper.TAppUserMapper;
import com.dsh.account.mapper.TStudentMapper;
import com.dsh.account.model.AddAppUserVo;
+import com.dsh.account.model.JoinPlayPaiVo;
import com.dsh.account.model.LoginSMSCodeVo;
import com.dsh.account.model.LoginWeChatVo;
import com.dsh.account.model.vo.classDetails.CourseVenue;
+import com.dsh.account.model.vo.classDetails.ExerciseVideo;
import com.dsh.account.model.vo.classDetails.RegisteredCourse;
import com.dsh.account.model.vo.classDetails.WeekedCourse;
import com.dsh.account.model.vo.classDetails.classInsVo.ClassInfoVo;
+import com.dsh.account.model.vo.classDetails.classInsVo.RegisterCourseVo;
+import com.dsh.account.model.vo.userBenefitDetail.BillingDetailsVo;
+import com.dsh.account.model.vo.userBenefitDetail.IndexOfUserBenefirVo;
import com.dsh.account.service.TAppUserService;
import com.dsh.account.util.*;
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;
-import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -66,20 +76,28 @@
@Resource
private CoursePaymentClient paymentClient;
+ @Resource
+ private StoreClient storeClient;
+
+ @Autowired
+ private MerChandiseClient mcClient;
+ @Autowired
+ private ImgConfigClient icfgClient;
@Override
- public ClassInfoVo queryUserOfStus(Integer id,String longitude,String latitude) {
+ public ClassInfoVo queryUserOfStus(Integer id,String latitude,String longitude) {
TAppUser tAppUser = this.baseMapper.selectById(id);
+ ClassInfoVo classInfoVo = new ClassInfoVo();
if (ToolUtil.isNotEmpty(tAppUser)){
List<TStudent> tStudents = tsmapper.selectList(new QueryWrapper<TStudent>()
.eq("appUserId",tAppUser.getId())
.eq("state",1)
.eq("isDefault",1));
- ClassInfoVo classInfoVo = new ClassInfoVo();
if (tStudents.size() > 0 ){
TStudent tStudent = tStudents.get(0);
+ classInfoVo.setStuId(tStudent.getId());
classInfoVo.setIsThere(1);
classInfoVo.setStuImg(tStudent.getHeadImg());
classInfoVo.setStuSex(tStudent.getSex());
@@ -115,25 +133,11 @@
classInfoVo.setRemainingNums(remain);
List<CourseOfStoreVo> storeOfCourses = paymentClient.getStoreOfCourses();
+ classInfoVo.setWeekCourseList(dealDatas(storeOfCourses,longitude,latitude));
- List<WeekedCourse> courses = new ArrayList<>();
+ List<ExerciseVideo> videos = new ArrayList<>();
-
-
-
- if (storeOfCourses.size() > 0){
- Map<Integer, List<CourseOfStoreVo>> map = storeOfCourses.stream().collect(Collectors.groupingBy(CourseOfStoreVo::getStoreId));
- for (Map.Entry<Integer, List<CourseOfStoreVo>> integerListEntry : map.entrySet()) {
- WeekedCourse weekedCourse = new WeekedCourse();
-
- Integer key = integerListEntry.getKey();
- System.out.println(key);
- List<CourseOfStoreVo> value = integerListEntry.getValue();
- System.out.println(value);
- }
-
- }
-// classInfoVo.setWeekCourseList();
+ classInfoVo.setExerciseVideoList(videos);
}else {
classInfoVo.setIsThere(2);
List<TImgConfig> tImgConfigs = configClient.getNoneStuImgs();
@@ -142,51 +146,44 @@
}
}
}
- return null;
+ return classInfoVo;
}
/**
* 处理数据
* @param storeOfCourses
+ * @param longitude
+ * @param latitude
* @return
*/
- public List<WeekedCourse> dealDatas(List<CourseOfStoreVo> storeOfCourses){
+ 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++) {
- if (weekStr == i){
- for (CourseOfStoreVo storeOfCours : storeOfCourses) {
- String[] split = storeOfCours.getClassWeeks().split(";");
- List<String> list = Arrays.asList(split);
- if (list.contains(weekStr)){
- WeekedCourse weekedCourse = new WeekedCourse();
- weekedCourse.setIsToday(1);
- weekedCourse.setWeekNum(weekStr);
- weekedCourse.setWeekStr(WeeksEnum.getStr(weekStr));
- String weekOfDays = LocalDateTimeUtils.getWeekOfDays(weekStr);
- weekedCourse.setDayStr(weekOfDays);
+ WeekedCourse weekedCourse = new WeekedCourse();
+ List<CourseVenue> courseVenues = new ArrayList<>();
+ 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();
+ CourseVenue courseVenue = new CourseVenue();
+ courseVenue.setStoreId(value.get(0).getStoreId());
+ courseVenue.setAreaName(value.get(0).getStoreName());
+ courseVenue.setSiteDistance(LonlatUtils.distance(Double.parseDouble(longitude), Double.parseDouble(latitude),
+ Double.parseDouble(value.get(0).getLon()), Double.parseDouble(value.get(0).getLat())) + "");
- List<CourseVenue> courseVenues = new ArrayList<>();
-// courseVenues.add();
- weekedCourse.setDetails(courseVenues);
- }
+ List<CourseVenue.CouList> courses = new ArrayList<>();
+ for (CourseOfStoreVo courseOfStoreVo : value) {
+ CourseVenue.CouList couList = new CourseVenue.CouList();
+ couList.setCourseID(courseOfStoreVo.getCourseId());
+ couList.setCourseName(courseOfStoreVo.getCourseName());
+ couList.setTimeStr(courseOfStoreVo.getClassStartTime() + "-" + courseOfStoreVo.getClassEndTime());
+ couList.setDetail("");
+ courses.add(couList);
}
- }else {
- for (CourseOfStoreVo storeOfCours : storeOfCourses) {
- String[] split = storeOfCours.getClassWeeks().split(";");
- List<String> list = Arrays.asList(split);
- if (list.contains(i)){
- WeekedCourse weekedCourse = new WeekedCourse();
- weekedCourse.setIsToday(1);
- weekedCourse.setWeekNum(weekStr);
- weekedCourse.setWeekStr(WeeksEnum.getStr(weekStr));
- String weekOfDays = LocalDateTimeUtils.getWeekOfDays(weekStr);
- weekedCourse.setDayStr(weekOfDays);
-
- }
- }
+ courseVenue.setCourses(courses);
+ courseVenues.add(courseVenue);
}
+ weekedCourse.setDetails(courseVenues);
+ weekedCourses.add(weekedCourse);
}
return weekedCourses;
}
@@ -208,7 +205,14 @@
}
}
String numberRandom = UUIDUtil.getNumberRandom(6);
- aLiSendSms.sendSms(phone, "SMS_161275250", "{\"code\":\"" + numberRandom + "\"}");
+ String templateCode = "";
+ if(type == 1 || type == 2){
+ templateCode = "SMS_161275250";
+ }
+ if(type == 3 || type == 4){
+ templateCode = "SMS_160960014";
+ }
+ aLiSendSms.sendSms(phone, templateCode, "{\"code\":\"" + numberRandom + "\"}");
redisUtil.setStrValue(phone, numberRandom, 300);
return ResultUtil.success();
}
@@ -248,6 +252,7 @@
tAppUser.setCityCode(cityCode);
}
}
+ tAppUser.setInsertTime(new Date());
this.baseMapper.insert(tAppUser);
return ResultUtil.success();
}
@@ -349,6 +354,7 @@
tAppUser.setCityCode(cityCode);
}
}
+ tAppUser.setInsertTime(new Date());
this.baseMapper.insert(tAppUser);
}
}
@@ -406,4 +412,75 @@
this.updateById(tAppUser);
return ResultUtil.success();
}
+
+
+ /**
+ * 定时任务修改到期会员的状态
+ */
+ @Override
+ public void membershipEnd() {
+ this.baseMapper.membershipEnd();
+ }
+
+
+ /**
+ * 获取加入玩湃首页数据
+ * @param lon
+ * @param lat
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public JoinPlayPaiVo queryJoinPlayPai(Integer uid, String lon, String lat) throws Exception {
+ TAppUser appUser = this.getById(uid);
+ JoinPlayPaiVo joinPlayPaiVo = new JoinPlayPaiVo();
+ joinPlayPaiVo.setIsVip(appUser.getIsVip());
+
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(lon, lat);
+ if(null != geocode){
+ String provinceCode = geocode.get("provinceCode");
+ String cityCode = geocode.get("cityCode");
+ List<Store> stores = storeClient.queryStoreList(new QueryStoreList(provinceCode, cityCode));
+ Store s = null;
+ Double d = 0D;
+ for (Store store : stores) {
+ Map<String, Double> distance = GeodesyUtil.getDistance(lon + "," + lat, store.getLon() + "," + store.getLat());
+ Double wgs84 = distance.get("WGS84");
+ if(s == null || d.compareTo(wgs84) < 0){
+ s = store;
+ d = wgs84;
+ }
+ }
+ joinPlayPaiVo.setName(s.getName());
+ joinPlayPaiVo.setLon(s.getLon());
+ joinPlayPaiVo.setLat(s.getLat());
+ joinPlayPaiVo.setStoreId(s.getId());
+ }
+ return joinPlayPaiVo;
+ }
+
+ @Override
+ public IndexOfUserBenefirVo queryBenefitDetails(Integer appUserId) {
+ IndexOfUserBenefirVo benefirVo = new IndexOfUserBenefirVo();
+
+ TAppUser appUser = this.getById(appUserId);
+ benefirVo.setUserHeadImg(appUser.getHeadImg());
+ benefirVo.setUserName(appUser.getName());
+ if (appUser.getIsVip() == 1){
+ benefirVo.setIsMember("年度会员");
+ }else {
+ benefirVo.setIsMember("普通用户");
+ }
+ benefirVo.setCommodities(mcClient.getConvertibleGoods());
+ benefirVo.setImage(icfgClient.getImageConfig());
+ return benefirVo;
+ }
+
+ @Override
+ public BillingDetailsVo queryUserBillingDetails(String yearMonth, Integer recordId) {
+ System.out.println("账单传参：yearMonth"+yearMonth+"|"+"recordId"+recordId);
+ // TODO: 2023/7/4 账单列表
+ return null;
+ }
+
}
--
Gitblit v1.7.1