From 60ef8b4a95540dfab9df0447364ee40c18354010 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 04 七月 2023 08:48:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 65 ++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 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 new file mode 100644 index 0000000..b08c9ec --- /dev/null +++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java @@ -0,0 +1,65 @@ +package com.dsh.competition.controller; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.dsh.competition.entity.Competition; +import com.dsh.competition.entity.UserCompetition; +import com.dsh.competition.feignclient.model.PurchaseRecordVo; +import com.dsh.competition.service.CompetitionService; +import com.dsh.competition.service.UserCompetitionService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +/** + * <p> + * 前端控制器 + * </p> + * + * @author jqs + * @since 2023-06-26 + */ +@RestController +@RequestMapping("") +public class CompetitionController { + + + @Autowired + private CompetitionService cttService; + + @Autowired + private UserCompetitionService ucttService; + + private final SimpleDateFormat dateFormat = new SimpleDateFormat("MM-dd HH:mm"); + + @PostMapping("/competition/getCompetitionsDetails") + public List<PurchaseRecordVo> getStuSourseList(@RequestBody Date startTime, @RequestBody Date endTime,@RequestParam("appUserId") Integer appUserId){ + + List<PurchaseRecordVo> recordVos = new ArrayList<>(); + + List<Competition> list = cttService.list(new QueryWrapper<Competition>() + .eq("payType",3 ) + .eq("auditStatus",2)); + List<Integer> comIds = list.stream().map(Competition::getId).collect(Collectors.toList()); + List<UserCompetition> userCompetitions = ucttService.queryUsersCompetetions(startTime,endTime,appUserId,comIds); + if (userCompetitions.size() > 0){ + userCompetitions.forEach(coms ->{ + PurchaseRecordVo recordVo = new PurchaseRecordVo(); + recordVo.setPurchaseType("报名赛事"); + recordVo.setPurchaseTime(dateFormat.format(coms.getInsertTime())); + Competition competition = cttService.getById(coms.getCompetitionId()); + recordVo.setPurchaseAmount("-"+competition.getPrice()); + recordVos.add(recordVo); + }); + } + return recordVos; + } + + +} + -- Gitblit v1.7.1