From fece6af66e0cfaf95896227a791810c79bafd2e8 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 08 八月 2023 10:09:18 +0800
Subject: [PATCH] 后台代码--远程用户
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 103 ++++++++++++++++++++++++++++++---------------------
1 files changed, 60 insertions(+), 43 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 ebc7574..275b2da 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
@@ -15,6 +15,7 @@
import com.dsh.account.feignclient.course.CoursePackageClient;
import com.dsh.account.feignclient.course.CoursePackageConfigClient;
import com.dsh.account.feignclient.course.CoursePaymentClient;
+import com.dsh.account.feignclient.course.VideoOfCourseListClient;
import com.dsh.account.feignclient.course.model.*;
import com.dsh.account.feignclient.other.ImgConfigClient;
import com.dsh.account.feignclient.other.RechargeConfigClient;
@@ -98,6 +99,10 @@
@Resource
private ImgConfigClient icfgClient;
+
+ @Resource
+ private VideoOfCourseListClient voclClient;
+
@Resource
private VipPaymentMapper vipPaymentMapper;
@@ -155,7 +160,9 @@
List<RegisteredCourse> courseList = new ArrayList<>();
List<StuCourseResp> stuCoursePayment = paymentClient.getStuCoursePayment(tStudent.getId());
+ List<Integer> coursePackIds = new ArrayList<>();
if (stuCoursePayment.size() > 0){
+ coursePackIds = stuCoursePayment.stream().map(StuCourseResp::getCourseId).collect(Collectors.toList());
for (StuCourseResp tCoursePackagePayment : stuCoursePayment) {
RegisteredCourse course = new RegisteredCourse();
course.setCourseId(tCoursePackagePayment.getCourseId());
@@ -168,10 +175,9 @@
}
}
classInfoVo.setCourseList(courseList);
-
- List<ExerciseVideo> videos = new ArrayList<>();
-
- classInfoVo.setExerciseVideoList(videos);
+ List<ExerciseVideo> stuCourseOfVideoList = voclClient.getStuCourseOfVideoList(coursePackIds);
+ System.out.println(stuCourseOfVideoList);
+ classInfoVo.setExerciseVideoList(stuCourseOfVideoList);
}else {
classInfoVo.setIsThere(2);
List<TImgConfig> tImgConfigs = configClient.getNoneStuImgs();
@@ -199,9 +205,12 @@
CourseVenue courseVenue = new CourseVenue();
courseVenue.setStoreId(storeId);
courseVenue.setAreaName(value.get(0).getCourseName());
- courseVenue.setSiteDistance(LonlatUtils.distance(Double.parseDouble(longitude), Double.parseDouble(latitude),
- Double.parseDouble(value.get(0).getLon()), Double.parseDouble(value.get(0).getLat())) + "");
-
+ if (ToolUtil.isEmpty(longitude) && ToolUtil.isEmpty(latitude)){
+ courseVenue.setSiteDistance(0+"");
+ }else {
+ courseVenue.setSiteDistance(LonlatUtils.distance(Double.parseDouble(longitude), Double.parseDouble(latitude),
+ Double.parseDouble(value.get(0).getLon()), Double.parseDouble(value.get(0).getLat())) + "");
+ }
List<CourseVenue.CouList> courses = new ArrayList<>();
for (CourseOfStoreVo courseOfStoreVo : value) {
CourseVenue.CouList couList = new CourseVenue.CouList();
@@ -209,6 +218,7 @@
couList.setCourseName(courseOfStoreVo.getCourseName());
couList.setTimeStr(courseOfStoreVo.getClassStartTime() + "-" + courseOfStoreVo.getClassEndTime());
couList.setDetail("￥" + courseOfStoreVo.getCoursePrice() + "/会员扣2学时");
+ couList.setStatus(courseOfStoreVo.getStatus());
courses.add(couList);
}
courseVenue.setCourses(courses);
@@ -479,6 +489,8 @@
TAppUser appUser = this.getById(appUserId);
benefirVo.setUserHeadImg(appUser.getHeadImg());
benefirVo.setUserName(appUser.getName());
+ benefirVo.setWpCoin(ToolUtil.isEmpty(appUser.getPlayPaiCoins()) ? 0 : appUser.getPlayPaiCoins());
+ benefirVo.setUserIntegral(ToolUtil.isEmpty(appUser.getIntegral()) ? 0 : appUser.getIntegral());
if (appUser.getIsVip() == 1){
benefirVo.setIsMember("年度会员");
}else {
@@ -637,15 +649,16 @@
List<RechargeCentVo> centVos = new ArrayList<>();
TAppUser tAppUser = this.baseMapper.selectById(appUserId);
List<Map<String, Object>> rechargeConfig = reconMapper.getRechargeConfig();
+ System.out.println(rechargeConfig);
if (rechargeConfig.size() > 0 ){
for (Map<String, Object> stringObjectMap : rechargeConfig) {
RechargeCentVo vo = new RechargeCentVo();
- vo.setChargeId((Integer) stringObjectMap.get("money"));
- vo.setAmount(""+stringObjectMap.get("money"));
+ Double money = (Double) stringObjectMap.get("money");
+ vo.setAmount(BigDecimal.valueOf(money) );
if (tAppUser.getIsVip() == 1){
- vo.setWpGold(stringObjectMap.get("MemberCoins")+"");
+ vo.setWpGold((Integer) stringObjectMap.get("MemberCoins"));
}else {
- vo.setWpGold(stringObjectMap.get("usersCoins")+"");
+ vo.setWpGold((Integer) stringObjectMap.get("usersCoins"));
}
centVos.add(vo);
}
@@ -738,26 +751,34 @@
}
}
if (StringUtils.hasText(request.getSearch())){
- goods = goods.stream()
- .filter(merchandise -> merchandise.getGoodName().contains(request.getSearch()))
- .collect(Collectors.toList());
+ if (goods.size() > 0 ){
+ goods = goods.stream()
+ .filter(merchandise -> merchandise.getGoodName().contains(request.getSearch()))
+ .collect(Collectors.toList());
+ }
}
if (null != request.getRank()){
switch (request.getRank()){
case 1:
- goods = goods.stream()
- .sorted(Comparator.comparing(Goods::getIntegral).reversed())
- .collect(Collectors.toList());
+ if (goods.size() > 0 ){
+ goods = goods.stream()
+ .sorted(Comparator.comparing(Goods::getIntegral).reversed())
+ .collect(Collectors.toList());
+ }
break;
case 2:
- goods = goods.stream()
- .sorted(Comparator.comparing(Goods::getIntegral))
- .collect(Collectors.toList());
+ if (goods.size() > 0 ){
+ goods = goods.stream()
+ .sorted(Comparator.comparing(Goods::getIntegral))
+ .collect(Collectors.toList());
+ }
break;
case 3:
- goods = goods.stream()
- .sorted(Comparator.comparing(Goods::getNums).reversed())
- .collect(Collectors.toList());
+ if (goods.size() > 0 ){
+ goods = goods.stream()
+ .sorted(Comparator.comparing(Goods::getNums).reversed())
+ .collect(Collectors.toList());
+ }
break;
default:
break;
@@ -765,13 +786,22 @@
}
if (null != request.getGoodsType()){
- goods = goods.stream()
- .filter(merchandise -> merchandise.getGoodsType().equals(request.getGoodsType()))
- .collect(Collectors.toList());
+ if (goods.size() > 0 ){
+ goods = goods.stream()
+ .filter(merchandise -> merchandise.getGoodsType().equals(request.getGoodsType()))
+ .collect(Collectors.toList());
+ }
}
- Pageable pageable = PageRequest.of(request.getPageNum() - 1, request.getPageSize());
- Page<Goods> page = getPage(goods, pageable);
- return page.getContent();
+
+ //当前第几页
+ int pageNo = request.getPageNum();
+ //一页五条
+ int size = request.getPageSize();
+
+ //分页
+ goods = goods.stream().skip((pageNo - 1) * size).limit(size).
+ collect(Collectors.toList());
+ return goods;
}
// 对数据进行分页处理的方法
@@ -779,20 +809,6 @@
int start = (int) pageable.getOffset();
int end = Math.min((start + pageable.getPageSize()), dataList.size());
return new PageImpl<>(dataList.subList(start, end), pageable, dataList.size());
- }
-
- @Override
- public ResultUtil uploadAppUserHeadImg(Integer appUserId, MultipartFile file, HttpServletRequest request) {
- try {
- String filePath = OssUploadUtil.ossUpload(request,file);
- TAppUser tAppUser = this.baseMapper.selectById(appUserId);
- tAppUser.setHeadImg(filePath);
- this.baseMapper.updateById(tAppUser);
- } catch (IOException e) {
- ResultUtil.error("头像上传失败！");
- }
-
- return ResultUtil.success();
}
@Override
@@ -1165,6 +1181,7 @@
weeksOfCourseRest.setStuId(stuId);
weeksOfCourseRest.setAppUserId(appUserId);
List<CourseOfStoreVo> storeOfCourses = paymentClient.getStoreOfCourses(weeksOfCourseRest);
+ System.out.println(storeOfCourses);
if (storeOfCourses.size() > 0 ){
courseVenues = dealDatas(storeOfCourses,longitude,latitude);
}
--
Gitblit v1.7.1