From c81d766cd91be3b3a24c8db94dcd93c071a66c62 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 14 七月 2023 09:30:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 84 +++++++++++++++++++++++++++++++++++------
1 files changed, 71 insertions(+), 13 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 474ce21..5119fd7 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
@@ -12,12 +12,12 @@
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.activity.model.ProductDetailRequest;
+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.CoursePackage;
-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;
@@ -45,8 +45,11 @@
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.*;
import java.util.stream.Collectors;
@@ -107,6 +110,9 @@
@Resource
private CoursePackageClient cpageClient;
+
+ @Resource
+ private DeductionCompetitionsClient deducClient;
@Override
public ClassInfoVo queryUserOfStus(Integer id,String latitude,String longitude) {
@@ -419,7 +425,7 @@
@Override
public JoinPlayPaiVo queryJoinPlayPai(Integer uid, String lon, String lat) throws Exception {
TAppUser appUser = this.getById(uid);
- if(ToolUtil.isEmpty(appUser.getProvince()) && ToolUtil.isNotEmpty(lon) && ToolUtil.isNotEmpty(lat)){
+ if(ToolUtil.isEmpty(appUser.getProvince()) && ToolUtil.isNotEmpty(lon)){
Map<String, String> geocode = gdMapGeocodingUtil.geocode(lon, lat);
if(null != geocode){
String province = geocode.get("province");
@@ -460,6 +466,7 @@
joinPlayPaiVo.setLon(s.getLon());
joinPlayPaiVo.setLat(s.getLat());
joinPlayPaiVo.setStoreId(s.getId());
+ joinPlayPaiVo.setPhone(s.getPhone());
}
return joinPlayPaiVo;
}
@@ -497,11 +504,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)
@@ -511,11 +548,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)
@@ -526,7 +562,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);
}
}
@@ -690,4 +726,26 @@
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();
+ }
+
+ @Override
+ public ProductDetailsVo productDetails(Integer goodId, Integer goodsType ) {
+ ProductDetailRequest detailsVo = new ProductDetailRequest();
+ detailsVo.setGoodsType(goodsType);
+ detailsVo.setGoodId(goodId);
+ return mcClient.getGoodDetailsWithId(detailsVo);
+ }
+
}
--
Gitblit v1.7.1