From 9fd9c3428134e78144de6e920516a558eaa36c6d Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期一, 07 八月 2023 17:20:00 +0800
Subject: [PATCH] app端：使用福利中充值明细的列表展示bug
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 38 ++++++++------------------------------
1 files changed, 8 insertions(+), 30 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 143f310..5c2700b 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
@@ -175,18 +175,8 @@
}
}
classInfoVo.setCourseList(courseList);
- List<ExerciseVideo> stuCourseOfVideoList = new ArrayList<>();
- ExerciseVideo video = new ExerciseVideo();
- video.setVideoUrl("https://media.w3.org/2010/05/sintel/trailer.mp4");
- video.setVideoCoverImgUrl("https://img1.baidu.com/it/u=1614146743,3691458181&fm=253&fmt=auto&app=120&f=JPEG?w=605&h=383");
- video.setVideoName("课后练习足球课");
- stuCourseOfVideoList.add(video);
-
- ExerciseVideo exerciseVideo = new ExerciseVideo();
- exerciseVideo.setVideoUrl("https://media.w3.org/2010/05/sintel/trailer.mp4");
- exerciseVideo.setVideoCoverImgUrl("https://img0.baidu.com/it/u=1492570361,4260963468&fm=253&fmt=auto&app=138&f=JPEG?w=750&h=500");
- exerciseVideo.setVideoName("篮球课");
- stuCourseOfVideoList.add(exerciseVideo);
+ List<ExerciseVideo> stuCourseOfVideoList = voclClient.getStuCourseOfVideoList(coursePackIds);
+ System.out.println(stuCourseOfVideoList);
classInfoVo.setExerciseVideoList(stuCourseOfVideoList);
}else {
classInfoVo.setIsThere(2);
@@ -228,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);
@@ -658,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);
}
@@ -810,20 +802,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
--
Gitblit v1.7.1