From a91463ee1c2bf2ef932bd1c5c061b225b2c83b77 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期二, 08 八月 2023 17:11:19 +0800
Subject: [PATCH] 修改积分变动记录的实体类，增加变动类型字段
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 101 ++++++++++++++++++++------------------------------
1 files changed, 41 insertions(+), 60 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 67557bd..7406b63 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
@@ -26,10 +26,7 @@
import com.dsh.account.feignclient.other.model.StoreDetailOfCourse;
import com.dsh.account.feignclient.other.model.TImgConfig;
import com.dsh.account.mapper.*;
-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.*;
import com.dsh.account.model.dto.Coupon;
import com.dsh.account.model.vo.classDetails.CourseVenue;
import com.dsh.account.model.vo.classDetails.ExerciseVideo;
@@ -175,19 +172,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);
- // TODO: 2023/8/3 List<ExerciseVideo> stuCourseOfVideoList1 = voclClient.getStuCourseOfVideoList();
+ List<ExerciseVideo> stuCourseOfVideoList = voclClient.getStuCourseOfVideoList(coursePackIds);
+ System.out.println(stuCourseOfVideoList);
classInfoVo.setExerciseVideoList(stuCourseOfVideoList);
}else {
classInfoVo.setIsThere(2);
@@ -229,6 +215,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);
@@ -517,6 +504,7 @@
List<ConsumeDetail> details = new ArrayList<>();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM-dd HH:mm");
+ SimpleDateFormat result = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date monthStart = null;
Date monthEnd = null;
if (StringUtils.hasText(yearMonth)) {
@@ -528,59 +516,59 @@
}
BillingDataRequestVo requestVo = new BillingDataRequestVo();
- requestVo.setMonthStart(monthStart);
- requestVo.setMonthEnd(monthEnd);
+ requestVo.setMonthStart(result.format(monthStart));
+ requestVo.setMonthEnd(result.format(monthEnd));
requestVo.setAppUserId(appUserId);
// 1.赛事报名
- List<PaymentCompetition> allCompetitionPayRecord = deducClient.getAllCompetitionPayRecord(requestVo);
- if (allCompetitionPayRecord.size() > 0 ){
- for (PaymentCompetition paymentCompetition : allCompetitionPayRecord) {
+ BillingRequestVo allCompetitionPayRecord = deducClient.getAllCompetitionPayRecord(requestVo);
+ if (ToolUtil.isNotEmpty(allCompetitionPayRecord.getRequests())){
+ for (BillingRequest paymentCompetition : allCompetitionPayRecord.getRequests()) {
ConsumeDetail consumeDetail = new ConsumeDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg());
- consumeDetail.setConsumeTime(simpleDateFormat.format(paymentCompetition.getInsertTime()));
+ consumeDetail.setConsumeTime(paymentCompetition.getTime());
consumeDetail.setConsumeAmount("-" + paymentCompetition.getAmount());
details.add(consumeDetail);
consumeDetail.setType(1);
}
}
// 2.取消赛事报名
- List<PaymentCompetition> cancelOrderOfUserPayRecord = deducClient.getCancelOrderOfUserPayRecord(requestVo);
- if (cancelOrderOfUserPayRecord.size() > 0 ){
- for (PaymentCompetition paymentCompetition : cancelOrderOfUserPayRecord) {
+ BillingRequestVo cancelOrderOfUserPayRecord = deducClient.getCancelOrderOfUserPayRecord(requestVo);
+ if (ToolUtil.isNotEmpty(cancelOrderOfUserPayRecord.getRequests())){
+ for (BillingRequest paymentCompetition : cancelOrderOfUserPayRecord.getRequests()) {
ConsumeDetail consumeDetail = new ConsumeDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.CANCEL_EVENT_REGISTRATION.getMsg());
- consumeDetail.setConsumeTime(simpleDateFormat.format(paymentCompetition.getInsertTime()));
+ consumeDetail.setConsumeTime(paymentCompetition.getTime());
consumeDetail.setConsumeAmount("+" + paymentCompetition.getAmount());
consumeDetail.setType(1);
details.add(consumeDetail);
}
}
// 3.课包购买
- List<TCoursePackagePayment> amountPayRecord = paymentClient.getAmountPayRecord(requestVo);
- if (amountPayRecord.size() > 0 ){
- for (TCoursePackagePayment coursePackagePayment : amountPayRecord) {
+ BillingRequestVo amountPayRecord = paymentClient.getAmountPayRecord(requestVo);
+ if (ToolUtil.isNotEmpty(amountPayRecord.getRequests())){
+ for (BillingRequest coursePackagePayment : amountPayRecord.getRequests()) {
ConsumeDetail consumeDetail = new ConsumeDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.COURSE_PACKAGE_PURCHASE.getMsg());
- consumeDetail.setConsumeTime(simpleDateFormat.format(coursePackagePayment.getInsertTime()));
- consumeDetail.setConsumeAmount("-" + coursePackagePayment.getCashPayment());
+ consumeDetail.setConsumeTime(coursePackagePayment.getTime());
+ consumeDetail.setConsumeAmount("-" + coursePackagePayment.getAmount());
consumeDetail.setType(2);
details.add(consumeDetail);
}
}
// 4.场地预约
- List<SiteBooking> allSiteBookingList = stClient.getAllSiteBookingList(requestVo);
- if (allSiteBookingList.size() > 0){
- for (SiteBooking booking : allSiteBookingList) {
+ RequestOfTypeVo allSiteBookingList = stClient.getAllSiteBookingList(requestVo);
+ if (ToolUtil.isNotEmpty(allSiteBookingList.getRequest())){
+ for (BillingRequestOfType booking : allSiteBookingList.getRequest()) {
ConsumeDetail consumeDetail = new ConsumeDetail();
if (booking.getStatus() != 5){
consumeDetail.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.getMsg());
- consumeDetail.setConsumeAmount("-" + booking.getPayMoney());
- consumeDetail.setConsumeTime(simpleDateFormat.format(booking.getPayTime()));
+ consumeDetail.setConsumeAmount("-" + booking.getAmount());
+ consumeDetail.setConsumeTime(booking.getTime());
consumeDetail.setType(2);
}else {
consumeDetail.setConsumeName(RechargeRecordEnum.CANCEL_VENUE_RESERVATION.getMsg());
- consumeDetail.setConsumeAmount("+" + booking.getPayMoney());
- consumeDetail.setConsumeTime(simpleDateFormat.format(booking.getCancelTime()));
+ consumeDetail.setConsumeAmount("+" + booking.getAmount());
+ consumeDetail.setConsumeTime(booking.getTime());
consumeDetail.setType(1);
}
details.add(consumeDetail);
@@ -683,9 +671,9 @@
CommodityRequest commodityRequest = new CommodityRequest();
commodityRequest.setLon(request.getLon());
commodityRequest.setLat(request.getLat());
- List<PointsMerchandise> vicinityGoods = mcClient.getVicinityGoods(commodityRequest);
- if (vicinityGoods.size() > 0) {
- for (PointsMerchandise vicinityGood : vicinityGoods) {
+ PointMerchandiseVo vicinityGoods = mcClient.getVicinityGoods(commodityRequest);
+ if (ToolUtil.isNotEmpty(vicinityGoods.getMerchandises())) {
+ for (PointsMerchandise vicinityGood : vicinityGoods.getMerchandises()) {
Goods commodity = new Goods();
switch (vicinityGood.getType()) {
case 1:
@@ -802,9 +790,16 @@
.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;
}
// 对数据进行分页处理的方法
@@ -812,20 +807,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
@@ -901,7 +882,7 @@
this.baseMapper.updateById(tAppUser);
// 现金支付
- if (exchangeType == 2) {
+ if (exchangeType == 2 || exchangeType == 3) {
switch (goodsType) {
case 2:
for (int i = 0; i < stuIds.size(); i++) {
--
Gitblit v1.7.1