From c697ed09cb1e257bc54603213b304e0f156326a6 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 02 十一月 2023 10:34:07 +0800
Subject: [PATCH] 支付会员送券功能补充 运营商权限bug修改
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 308 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 297 insertions(+), 11 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index f613014..4d66956 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -1,6 +1,7 @@
package com.dsh.competition.controller;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,10 +11,9 @@
import com.dsh.competition.entity.UserCompetition;
import com.dsh.competition.feignclient.account.AppUserClient;
import com.dsh.competition.feignclient.account.model.AppUser;
+import com.dsh.competition.feignclient.course.CoursePackagePaymentClient;
import com.dsh.competition.feignclient.model.*;
-import com.dsh.competition.model.CompetitionInfo;
-import com.dsh.competition.model.CompetitionListVo;
-import com.dsh.competition.model.PaymentCompetitionVo;
+import com.dsh.competition.model.*;
import com.dsh.competition.service.CompetitionService;
import com.dsh.competition.service.IParticipantService;
import com.dsh.competition.service.IPaymentCompetitionService;
@@ -25,17 +25,18 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+
+import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
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.concurrent.CompletionService;
import java.util.stream.Collectors;
/**
@@ -74,7 +75,80 @@
@Autowired
private AppUserClient appUserClient;
+ /**
+ * 根据门店ids 获取对应的赛事 根据赛事支付记录获取用户ids
+ */
+ @ResponseBody
+ @PostMapping("/base/competition/getUserIds")
+ public List<Integer> getUserIds(@RequestBody ListQuery query){
+ List<Competition> list = cttService.list(new QueryWrapper<Competition>());
+ // 赛事id集合
+ List<Integer> comIds = new ArrayList<>();
+ for (Integer id : query.getIds()) {
+ for (Competition competition : list) {
+ if (competition.getStoreId().contains(id.toString())){
+ comIds.add(competition.getId());
+ }
+ }
+ }
+ // 获取到赛事id集合 去重
+ List<Integer> collect = comIds.stream().distinct().collect(Collectors.toList());
+ // 根据赛事id 查询赛事支付记录 获取用户ids
+ if (collect.size() == 0){
+ return new ArrayList<>();
+ }else{
+ List<Integer> userIds = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
+ .in("competitionId", collect)).stream()
+ .map(PaymentCompetition::getAppUserId).collect(Collectors.toList());
+ return userIds;
+ }
+
+ }
+ /**
+ * 获取赛事报名记录
+ */
+ @ResponseBody
+ @RequestMapping("/base/competition/listAllPayment")
+ public List<PaymentCompetition> listAllPayment(@RequestBody CompetitionQuery query){
+ Integer operatorId1 = query.getOperatorId();
+ if (operatorId1!=null){
+ // 赛事集合id
+ List<Integer> operatorId = cttService.list(new QueryWrapper<Competition>()
+ .eq("operatorId", operatorId1)).stream().map(Competition::getId).collect(Collectors.toList());
+ query.setUserIds(operatorId);
+ }
+ List<PaymentCompetition> paymentCompetitions = paymentCompetitionService.listAll(query);
+ List<PaymentCompetition> result = new ArrayList<>();
+ if (query.getOperatorId()!=null){
+ for (PaymentCompetition paymentCompetition : paymentCompetitions) {
+ Integer competitionId = paymentCompetition.getCompetitionId();
+ Competition byId = cttService.getById(competitionId);
+ if (byId!=null){
+ Integer operatorId = byId.getOperatorId();
+ if (operatorId!=null){
+ if (operatorId == query.getOperatorId()){
+ result.add(paymentCompetition);
+ }
+ }
+ }
+ }
+ return result;
+ }else if (query.getStoreId()!=null){
+ for (PaymentCompetition paymentCompetition : paymentCompetitions) {
+ Integer competitionId = paymentCompetition.getCompetitionId();
+ Competition byId = cttService.getById(competitionId);
+ if (byId!=null){
+ String storeId = byId.getStoreId();
+ if (storeId.contains(query.getStoreId().toString())){
+ result.add(paymentCompetition);
+ }
+ }
+ }
+ return result;
+ }
+ return paymentCompetitions;
+ }
@ResponseBody
@PostMapping("/base/competition/getPayedCompetitions")
public BillingRequestVo getAllCompetitionPayRecord(@RequestBody BillingDataRequestVo requestVo){
@@ -105,13 +179,23 @@
@PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
public List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId){
ArrayList<Integer> integers = new ArrayList<>();
- integers.add(1);
- integers.add(2);
+// integers.add(1);
+// integers.add(2);
+ integers.add(3);
+
return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
.in("payType",integers)
.eq("appUserId",appUserId)
- .eq("payStatus",3));
+ .eq("payStatus",2));
}
+
+
+ @PostMapping("/base/competition/queryByCode")
+ public Integer queryByCode(@RequestBody String code){
+
+ return paymentCompetitionService.queryByCode(code);
+ }
+
@@ -148,6 +232,38 @@
return recordVos;
}
+
+ @PostMapping("/base/competition/getCompetitionsDetails1")
+ public List<PurchaseRecordVo> getStuSourseList1(@RequestBody GetStuSourseList sourseList){
+
+ List<PurchaseRecordVo> recordVos = new ArrayList<>();
+
+ ArrayList<Integer> integers = new ArrayList<>();
+ integers.add(4);
+ List<PaymentCompetition> list = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
+ .in("payType",integers )
+ .eq("appUserId", sourseList.getAppUserId())
+ .eq("state",1));
+ if (list.size() > 0){
+ List<Long> comIds = list.stream().map(PaymentCompetition::getId).collect(Collectors.toList());
+ List<UserCompetition> userCompetitions = ucttService.list(new QueryWrapper<UserCompetition>()
+ .between("insertTime", sourseList.getStartTime(),sourseList.getEndTime() )
+ .eq("appUserId", sourseList.getAppUserId())
+ .in("paymentCompetitionId",comIds ));
+ if (userCompetitions.size() > 0){
+ userCompetitions.forEach(coms ->{
+ PurchaseRecordVo recordVo = new PurchaseRecordVo();
+ recordVo.setPurchaseType("报名赛事");
+ recordVo.setPurchaseTime(dateFormat.format(coms.getInsertTime()));
+ PaymentCompetition paymentCompetition = paymentCompetitionService.getById(coms.getPaymentCompetitionId());
+ recordVo.setPurchaseAmount("-"+paymentCompetition.getAmount());
+ recordVos.add(recordVo);
+ });
+ }
+ }
+
+ return recordVos;
+ }
@@ -199,6 +315,13 @@
+
+ @Autowired
+ private CompetitionService competitionService;
+ @Resource
+ private CoursePackagePaymentClient coursePackagePaymentClient;
+
+
@ResponseBody
@PostMapping("/api/competition/paymentCompetition")
@ApiOperation(value = "赛事报名", tags = {"APP-赛事活动列表"})
@@ -206,11 +329,38 @@
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil paymentCompetition(PaymentCompetitionVo paymentCompetitionVo){
+
+ public synchronized ResultUtil paymentCompetition(PaymentCompetitionVo paymentCompetitionVo){
try {
+ Competition byId = competitionService.getById(paymentCompetitionVo.getId());
+ Date date = byId.getEndTime();
+ // Assuming you have a Date object
+ // Check if the date is past the current time
+ boolean isPast = date.after(new Date());
+ if (!isPast) {
+ return new ResultUtil(0,"已超过截至报名时间");
+ }
Integer uid = tokenUtil.getUserIdFormRedis();
if(null == uid){
return ResultUtil.tokenErr();
+ }
+ if (byId.getRegisterCondition()==3){
+ Integer counts = coursePackagePaymentClient.isHave(uid);
+ if (counts==0){
+ return new ResultUtil(0,"当前赛事仅限已购课学员报名");
+ }
+ }
+ if (byId.getRegisterCondition()==2){
+ AppUser appUser = appUserClient.queryAppUser(uid);
+ if (appUser.getIsVip()==0){
+ return new ResultUtil(0,"当前赛事仅限年度会员报名");
+ }else {
+ Date vipEndTime = appUser.getVipEndTime();
+ Date currentTime = new Date(); // Current time
+ if (vipEndTime.before(currentTime)) {
+ return new ResultUtil(0,"您的年度会员已过期，请续费");
+ }
+ }
}
return cttService.paymentCompetition(uid, paymentCompetitionVo);
}catch (Exception e){
@@ -218,6 +368,8 @@
return ResultUtil.runErr();
}
}
+
+
@ResponseBody
@PostMapping("/api/competition/paymentCompetitionCourseList")
@ApiOperation(value = "赛事报名--支付可用课时列表", tags = {"APP-赛事活动列表"})
@@ -541,5 +693,139 @@
}
}
+
+
+ @PostMapping("/base/competition/queryFee")
+ public Double queryFee(@RequestBody QueryDataFee queryDataFee){
+ HashMap<String, Object> map = new HashMap<>();
+ String data = queryDataFee.getData();
+ List<Integer> ids = queryDataFee.getIds();
+ if(ids.size()==0){
+ ids.add(-1);
+ }
+ LambdaQueryWrapper<PaymentCompetition> vipPaymentLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ if(ToolUtil.isNotEmpty(data)){
+ String stime = data.split(" - ")[0]+" 00:00:00";
+ String etime = data.split(" - ")[1]+" 23:59:59";
+ vipPaymentLambdaQueryWrapper.between(PaymentCompetition::getInsertTime,stime,etime);
+ }
+ vipPaymentLambdaQueryWrapper.in(PaymentCompetition::getAppUserId,ids);
+ vipPaymentLambdaQueryWrapper.eq(PaymentCompetition::getPayStatus,2);
+ ArrayList<Integer> objects = new ArrayList<>();
+ objects.add(1);
+ objects.add(2);
+ vipPaymentLambdaQueryWrapper.in(PaymentCompetition::getPayType,objects);
+ List<PaymentCompetition> list = paymentCompetitionService.list(vipPaymentLambdaQueryWrapper);
+ double sum = list.stream().mapToDouble(PaymentCompetition::getAmount).sum();
+ return sum;
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/base/competition/actPt")
+ public HashMap<String, Object> actPt(@RequestBody List<Integer> ids){
+ HashMap<String, Object> map = new HashMap<>();
+ if(ids.size()==0){
+ ids.add(-1);
+ }
+ ArrayList<Object> integers = new ArrayList<>();
+ int year = DateUtil.year(new Date());
+
+ for (int i = 0; i < 10; i++) {
+ integers.add(year-i);
+ }
+ List<Object> collect = integers.stream().sorted().collect(Collectors.toList());
+ // 年
+ ArrayList<Integer> years = new ArrayList<>();
+ ArrayList<Integer> yearsUser = new ArrayList<>();
+ for (Object o : collect) {
+ String s = o.toString();
+ int count = cttService.count(new LambdaQueryWrapper<Competition>().like(Competition::getInsertTime, s));
+ int count1 = ucttService.count(new LambdaQueryWrapper<UserCompetition>().in(UserCompetition::getAppUserId, ids).like(UserCompetition::getInsertTime,s));
+ years.add(count);
+ yearsUser.add(count1);
+ }
+ map.put("yearData",years);
+ map.put("yearsUser",yearsUser);
+ // 月
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+ ArrayList<Integer> months = new ArrayList<>();
+ ArrayList<Integer> monthsUser = new ArrayList<>();
+ for (int i = 1; i <= 12; i++) {
+ double sum=0.0;
+ String m=i+"";
+ if(i<10){
+ m="0"+i;
+ }
+ String s = year + "-" + m;
+ int count = cttService.count(new LambdaQueryWrapper<Competition>().like(Competition::getInsertTime, s));
+ int count1 = ucttService.count(new LambdaQueryWrapper<UserCompetition>().in(UserCompetition::getAppUserId, ids).like(UserCompetition::getInsertTime,s));
+ months.add(count);
+ monthsUser.add(count1);
+ }
+ map.put("monthData",months);
+ map.put("monthsUser",monthsUser);
+
+ return map;
+
+
+
+ }
+ @ResponseBody
+ @PostMapping("/base/competition/actYys")
+ public HashMap<String, Object> actYys(@RequestBody CompetionVO vo){
+ HashMap<String, Object> map = new HashMap<>();
+ if(vo.getIds().size()==0){
+ vo.getIds().add(-1);
+ }
+ ArrayList<Object> integers = new ArrayList<>();
+ int year = DateUtil.year(new Date());
+
+ for (int i = 0; i < 10; i++) {
+ integers.add(year-i);
+ }
+ List<Object> collect = integers.stream().sorted().collect(Collectors.toList());
+ // 年
+ ArrayList<Integer> years = new ArrayList<>();
+ ArrayList<Integer> yearsUser = new ArrayList<>();
+ Integer operatorId = vo.getOperatorId();
+ List<Integer> operatorId1 = cttService.list(new QueryWrapper<Competition>().eq("operatorId", operatorId))
+ .stream().map(Competition::getId).collect(Collectors.toList());
+ for (Object o : collect) {
+ String s = o.toString();
+ int count = cttService.count(new LambdaQueryWrapper<Competition>().like(Competition::getInsertTime, s).eq(Competition::getOperatorId,vo.getOperatorId()));
+ int count1 = ucttService.count(new LambdaQueryWrapper<UserCompetition>().in(UserCompetition::getAppUserId, vo.getIds()).like(UserCompetition::getInsertTime,s));
+ years.add(count);
+ yearsUser.add(count1);
+ }
+ map.put("yearData",years);
+ map.put("yearsUser",yearsUser);
+ // 月
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+ ArrayList<Integer> months = new ArrayList<>();
+ ArrayList<Integer> monthsUser = new ArrayList<>();
+ for (int i = 1; i <= 12; i++) {
+ double sum=0.0;
+ String m=i+"";
+ if(i<10){
+ m="0"+i;
+ }
+ String s = year + "-" + m;
+ int count = cttService.count(new LambdaQueryWrapper<Competition>().like(Competition::getInsertTime, s).ne(Competition::getOperatorId,operatorId));
+ int count1 = ucttService.count(new LambdaQueryWrapper<UserCompetition>().in(UserCompetition::getAppUserId, vo.getIds()).like(UserCompetition::getInsertTime,s));
+ months.add(count);
+ monthsUser.add(count1);
+ }
+ map.put("monthData",months);
+ map.put("monthsUser",monthsUser);
+
+ return map;
+
+
+
+ }
}
--
Gitblit v1.7.1