From 134d13688e4b6677133ba2d362d2978d8bda2b87 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 12 七月 2023 11:46:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 217 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 199 insertions(+), 18 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 4e6c0fb..80663ea 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
@@ -9,10 +9,14 @@
import com.dsh.account.entity.VipPayment;
import com.dsh.account.enums.RechargeRecordEnum;
import com.dsh.account.feignclient.activity.MerChandiseClient;
+import com.dsh.account.feignclient.activity.UserConponClient;
+import com.dsh.account.feignclient.activity.model.CommodityRequest;
+import com.dsh.account.feignclient.activity.model.PointsMerchandise;
+import com.dsh.account.feignclient.competition.DeductionCompetitionsClient;
+import com.dsh.account.feignclient.competition.model.PaymentCompetition;
+import com.dsh.account.feignclient.course.CoursePackageClient;
import com.dsh.account.feignclient.course.CoursePaymentClient;
-import com.dsh.account.feignclient.course.model.CourseOfStoreVo;
-import com.dsh.account.feignclient.course.model.QueryStoreList;
-import com.dsh.account.feignclient.course.model.StuCourseResp;
+import com.dsh.account.feignclient.course.model.*;
import com.dsh.account.feignclient.other.ImgConfigClient;
import com.dsh.account.feignclient.other.RechargeConfigClient;
import com.dsh.account.feignclient.other.StoreClient;
@@ -26,14 +30,13 @@
import com.dsh.account.model.JoinPlayPaiVo;
import com.dsh.account.model.LoginSMSCodeVo;
import com.dsh.account.model.LoginWeChatVo;
+import com.dsh.account.model.dto.Coupon;
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.userBenefitDetail.BillingDetailsVo;
-import com.dsh.account.model.vo.userBenefitDetail.IndexOfUserBenefirVo;
-import com.dsh.account.model.vo.userBenefitDetail.RechargeCentVo;
+import com.dsh.account.model.vo.userBenefitDetail.*;
import com.dsh.account.service.TAppUserService;
import com.dsh.account.util.*;
import com.dsh.account.util.akeylogin.Md5Util;
@@ -41,13 +44,13 @@
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -100,6 +103,15 @@
@Resource
private RechargeConfigClient reconMapper;
+
+ @Resource
+ private UserConponClient ucponClient;
+
+ @Resource
+ private CoursePackageClient cpageClient;
+
+ @Resource
+ private DeductionCompetitionsClient deducClient;
@Override
public ClassInfoVo queryUserOfStus(Integer id,String latitude,String longitude) {
@@ -490,11 +502,41 @@
monthEnd = DateTimeHelper.getCurrentMouthEnd();
}
// 1.赛事报名
-// 2.课包购买
-
-// 3.场地预约
-// 4.智慧球场
-// 5.年度会员
+ List<PaymentCompetition> allCompetitionPayRecord = deducClient.getAllCompetitionPayRecord(appUserId);
+ if (allCompetitionPayRecord.size() > 0 ){
+ for (PaymentCompetition paymentCompetition : allCompetitionPayRecord) {
+ BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg());
+ consumeDetail.setConsumeTime(simpleDateFormat.format(paymentCompetition.getInsertTime()));
+ consumeDetail.setConsumeAmount("-" + paymentCompetition.getAmount());
+ details.add(consumeDetail);
+ }
+ }
+// 2.取消赛事报名
+ List<PaymentCompetition> cancelOrderOfUserPayRecord = deducClient.getCancelOrderOfUserPayRecord(appUserId);
+ if (cancelOrderOfUserPayRecord.size() > 0 ){
+ for (PaymentCompetition paymentCompetition : cancelOrderOfUserPayRecord) {
+ BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ consumeDetail.setConsumeName(RechargeRecordEnum.CANCEL_EVENT_REGISTRATION.getMsg());
+ consumeDetail.setConsumeTime(simpleDateFormat.format(paymentCompetition.getInsertTime()));
+ consumeDetail.setConsumeAmount("+" + paymentCompetition.getAmount());
+ details.add(consumeDetail);
+ }
+ }
+// 3.课包购买
+ List<TCoursePackagePayment> amountPayRecord = paymentClient.getAmountPayRecord(appUserId);
+ if (amountPayRecord.size() > 0 ){
+ for (TCoursePackagePayment coursePackagePayment : amountPayRecord) {
+ BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ consumeDetail.setConsumeName(RechargeRecordEnum.COURSE_PACKAGE_PURCHASE.getMsg());
+ consumeDetail.setConsumeTime(simpleDateFormat.format(coursePackagePayment.getInsertTime()));
+ consumeDetail.setConsumeAmount("-" + coursePackagePayment.getCashPayment());
+ details.add(consumeDetail);
+ }
+ }
+// 4.场地预约
+// 5.智慧球场
+// 6.年度会员
List<VipPayment> vipPayments = vipPaymentMapper.selectList(new QueryWrapper<VipPayment>()
.eq("payStatus", 2)
.eq("appUserId", appUserId)
@@ -504,11 +546,10 @@
BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.ANNUAL_MEMBERSHIP.getMsg());
consumeDetail.setConsumeTime(simpleDateFormat.format(vipPayment.getInsertTime()));
- consumeDetail.setConsumeAmount("+" + vipPayment.getAmount());
+ consumeDetail.setConsumeAmount("-" + vipPayment.getAmount());
details.add(consumeDetail);
}
}
-// 6.续课
// 7.充值
List<RechargeRecords> rechargeRecords = rrMapper.selectList(new QueryWrapper<RechargeRecords>()
.eq("payStatus", 2)
@@ -519,7 +560,7 @@
BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.getMsg() + "：" + rechargeRecord.getPlayPaiCoins());
consumeDetail.setConsumeTime(simpleDateFormat.format(rechargeRecord.getInsertTime()));
- consumeDetail.setConsumeAmount("+" + rechargeRecord.getAmount());
+ consumeDetail.setConsumeAmount("-" + rechargeRecord.getAmount());
details.add(consumeDetail);
}
}
@@ -557,4 +598,144 @@
return centVos;
}
+ @Override
+ public PointMallDetailsResponse queryAppUserIntegral(MallRequest request, Integer userIdFormRedis) {
+ PointMallDetailsResponse detailsResponse = new PointMallDetailsResponse();
+ List<PointMallDetailsResponse.Goods> goods = new ArrayList<>();
+
+ TAppUser tAppUser = this.baseMapper.selectById(userIdFormRedis);
+ detailsResponse.setName(tAppUser.getName());
+ detailsResponse.setIntegral(tAppUser.getIntegral());
+ detailsResponse.setHeadImg(tAppUser.getHeadImg());
+
+ 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) {
+ PointMallDetailsResponse.Goods commodity = new PointMallDetailsResponse.Goods();
+ switch (vicinityGood.getType()) {
+ case 1:
+ commodity.setGoodId(vicinityGood.getId());
+ commodity.setGoodName(vicinityGood.getName());
+ commodity.setGoodImg(vicinityGood.getCover());
+ commodity.setCondition(vicinityGood.getRedemptionMethod());
+ if (vicinityGood.getRedemptionMethod() == 1) {
+ commodity.setIntegral(vicinityGood.getIntegral().intValue());
+ } else {
+ commodity.setIntegral(vicinityGood.getIntegral().intValue());
+ commodity.setAmount(vicinityGood.getCash());
+ }
+ commodity.setBelongsType(vicinityGood.getUserPopulation());
+ commodity.setGoodsType(1);
+ commodity.setNums(mcClient.getRedeemedQuantity(vicinityGood.getId()));
+ break;
+ case 2:
+ commodity.setGoodId(vicinityGood.getCoursePackageId());
+ CoursePackage coursePackage = cpageClient.queryCoursePackageById(vicinityGood.getCoursePackageId());
+ commodity.setGoodImg(coursePackage.getCoverDrawing());
+ commodity.setGoodName(coursePackage.getName());
+ commodity.setCondition(vicinityGood.getRedemptionMethod());
+ if (vicinityGood.getRedemptionMethod() == 1) {
+ commodity.setIntegral(vicinityGood.getIntegral().intValue());
+ } else {
+ commodity.setIntegral(vicinityGood.getIntegral().intValue());
+ commodity.setAmount(vicinityGood.getCash());
+ }
+ commodity.setBelongsType(vicinityGood.getUserPopulation());
+ commodity.setGoodsType(2);
+ commodity.setNums(mcClient.getRedeemedQuantity(vicinityGood.getId()));
+ break;
+ case 3:
+ commodity.setGoodId(vicinityGood.getId());
+ commodity.setGoodName(vicinityGood.getName());
+ commodity.setGoodImg(vicinityGood.getCover());
+ commodity.setCondition(vicinityGood.getRedemptionMethod());
+ if (vicinityGood.getRedemptionMethod() == 1) {
+ commodity.setIntegral(vicinityGood.getIntegral().intValue());
+ } else {
+ commodity.setIntegral(vicinityGood.getIntegral().intValue());
+ commodity.setAmount(vicinityGood.getCash());
+ }
+ commodity.setBelongsType(vicinityGood.getUserPopulation());
+ commodity.setGoodsType(3);
+ commodity.setNums(mcClient.getRedeemedQuantity(vicinityGood.getId()));
+ break;
+ default:
+ break;
+ }
+ goods.add(commodity);
+ }
+ }
+ List<Coupon> allCoupons = ucponClient.getAllCoupons(commodityRequest);
+ if (allCoupons.size() > 0) {
+ for (Coupon allCoupon : allCoupons) {
+ PointMallDetailsResponse.Goods commodity = new PointMallDetailsResponse.Goods();
+ commodity.setGoodId(allCoupon.getId());
+ commodity.setGoodName(allCoupon.getName());
+ commodity.setCondition(allCoupon.getRedemptionMethod());
+ commodity.setGoodImg(allCoupon.getCover());
+ if (allCoupon.getRedemptionMethod() == 1) {
+ commodity.setIntegral(allCoupon.getIntegral().intValue());
+ } else {
+ commodity.setIntegral(allCoupon.getIntegral().intValue());
+ commodity.setAmount(allCoupon.getCash());
+ }
+ commodity.setBelongsType(allCoupon.getUserPopulation());
+ commodity.setGoodsType(4);
+ commodity.setNums(ucponClient.getRedeemedQuantity(allCoupon.getId()));
+ goods.add(commodity);
+ }
+ }
+ if (StringUtils.hasText(request.getSearch())){
+ 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(PointMallDetailsResponse.Goods::getIntegral).reversed())
+ .collect(Collectors.toList());
+ break;
+ case 2:
+ goods = goods.stream()
+ .sorted(Comparator.comparing(PointMallDetailsResponse.Goods::getIntegral))
+ .collect(Collectors.toList());
+ break;
+ case 3:
+ goods = goods.stream()
+ .sorted(Comparator.comparing(PointMallDetailsResponse.Goods::getNums).reversed())
+ .collect(Collectors.toList());
+ break;
+ default:
+ break;
+ }
+
+ }
+ if (null != request.getGoodsType()){
+ goods = goods.stream()
+ .filter(merchandise -> merchandise.getGoodsType().equals(request.getGoodsType()))
+ .collect(Collectors.toList());
+ }
+ detailsResponse.setGoods(goods);
+ return detailsResponse;
+ }
+
+ @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();
+ }
+
}
--
Gitblit v1.7.1