From a9564eae9f0169ca39329b2f14a8f13d13358a0a Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期五, 17 十一月 2023 15:28:44 +0800 Subject: [PATCH] 11.7 --- cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 554 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 495 insertions(+), 59 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 1cde1fc..0dcb55c 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,19 +1,22 @@ package com.dsh.competition.controller; +import cn.hutool.core.date.DateUtil; +import cn.hutool.poi.excel.ExcelUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.dsh.competition.entity.Competition; +import com.dsh.competition.entity.Participant; import com.dsh.competition.entity.PaymentCompetition; import com.dsh.competition.entity.UserCompetition; -import com.dsh.competition.feignclient.model.GetStuSourseList; -import com.dsh.competition.feignclient.model.ListQuery; -import com.dsh.competition.feignclient.model.PurchaseRecordVo; -import com.dsh.competition.model.CompetitionInfo; -import com.dsh.competition.model.CompetitionListVo; -import com.dsh.competition.model.PaymentCompetitionVo; +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.*; import com.dsh.competition.service.CompetitionService; +import com.dsh.competition.service.IParticipantService; import com.dsh.competition.service.IPaymentCompetitionService; import com.dsh.competition.service.UserCompetitionService; import com.dsh.competition.util.PayMoneyUtil; @@ -23,17 +26,20 @@ 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.OutputStream; import java.io.PrintWriter; +import java.text.DateFormat; 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; /** @@ -66,12 +72,120 @@ @Autowired private IPaymentCompetitionService paymentCompetitionService; + @Autowired + private IParticipantService participantService; + @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 List<PaymentCompetition> getAllCompetitionPayRecord(@RequestBody Integer appUserId){ - List<Integer> integers = new ArrayList<>(); - integers.add(1); - integers.add(2); + public BillingRequestVo getAllCompetitionPayRecord(@RequestBody BillingDataRequestVo requestVo){ + BillingRequestVo billingRequestVo = new BillingRequestVo(); + List<BillingRequest> integers = new ArrayList<>(); + integers = paymentCompetitionService.queryDatas(requestVo.getAppUserId(),requestVo.getMonthStart(),requestVo.getMonthEnd()); + System.out.println(integers); + if (integers.size() > 0 ){ + billingRequestVo.setRequests(integers); + } + return billingRequestVo; + } + + @ResponseBody + @PostMapping("/base/competition/getCancelOrderOfUserPay") + public BillingRequestVo getCancelOrderOfUserPayRecord(@RequestBody BillingDataRequestVo requestVo){ + BillingRequestVo billingRequestVo = new BillingRequestVo(); + List<BillingRequest> integers = new ArrayList<>(); + integers = paymentCompetitionService.queryCancelDatas(requestVo.getAppUserId(),requestVo.getMonthStart(),requestVo.getMonthEnd()); + System.out.println(integers); + if (integers.size() > 0 ){ + billingRequestVo.setRequests(integers); + } + return billingRequestVo; + } + + + @PostMapping("/base/competition/getPlayPaiFGoldPayRecord") + public List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId){ + ArrayList<Integer> integers = new ArrayList<>(); +// integers.add(1); +// integers.add(2); + integers.add(3); + return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>() .in("payType",integers) .eq("appUserId",appUserId) @@ -79,25 +193,12 @@ } - @PostMapping("/base/competition/getCancelOrderOfUserPay") - public List<PaymentCompetition> getCancelOrderOfUserPayRecord(@RequestBody Integer appUserId){ - List<Integer> integers = new ArrayList<>(); - integers.add(1); - integers.add(2); - return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>() - .in("payType",integers) - .eq("appUserId",appUserId) - .eq("payStatus",3)); + @PostMapping("/base/competition/queryByCode") + public Integer queryByCode(@RequestBody String code){ + + return paymentCompetitionService.queryByCode(code); } - - @PostMapping("/base/competition/getPlayPaiFGoldPayRecord") - public List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId){ - return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>() - .eq("payType",3) - .eq("appUserId",appUserId) - .eq("payStatus",3)); - } @@ -106,27 +207,66 @@ 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.list(new QueryWrapper<UserCompetition>() - .between("insertTime", sourseList.getStartTime(),sourseList.getEndTime() ) - .eq("userId", sourseList.getAppUserId()) - .in("competitionId",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); - }); + ArrayList<Integer> integers = new ArrayList<>(); + integers.add(1); + integers.add(2); + 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; } + + @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; + } @@ -144,7 +284,11 @@ public ResultUtil<List<CompetitionListVo>> queryCompetitionList(String cityCode, String content, Integer registerCondition, String heat){ try { List<CompetitionListVo> competitionListVos = cttService.queryCompetitionList(cityCode, content, registerCondition, heat); - return ResultUtil.success(competitionListVos); + List<CompetitionListVo> filteredList = competitionListVos.stream() + .filter(vo -> vo.getStatus() == 1 || vo.getStatus() == 2) + .collect(Collectors.toList()); + + return ResultUtil.success(filteredList); }catch (Exception e){ e.printStackTrace(); return ResultUtil.runErr(); @@ -169,6 +313,19 @@ return ResultUtil.tokenErr(); } CompetitionInfo competitionInfo = cttService.queryCompetitionInfo(uid, id, lon, lat); + + + String dateString = competitionInfo.getRegisterEndTime(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + Date date = sdf.parse(dateString); + if (new Date().after(date)){ + competitionInfo.setHasPass(1); + }else { + competitionInfo.setHasPass(0); + + } + + return ResultUtil.success(competitionInfo); }catch (Exception e){ e.printStackTrace(); @@ -178,19 +335,75 @@ + + @Autowired + private CompetitionService competitionService; + @Resource + private CoursePackagePaymentClient coursePackagePaymentClient; + + @ResponseBody @PostMapping("/api/competition/paymentCompetition") @ApiOperation(value = "赛事报名", tags = {"APP-赛事活动列表"}) @ApiImplicitParams({ @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(paymentCompetitionVo.getIds()); + 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){ + e.printStackTrace(); + return ResultUtil.runErr(); + } + } + + + @ResponseBody + @PostMapping("/api/competition/paymentCompetitionCourseList") + @ApiOperation(value = "赛事报名--支付可用课时列表", tags = {"APP-赛事活动列表"}) + @ApiImplicitParams({ + @ApiImplicitParam(name = "Authorization", value = "用户token(Bearer +token)", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."), + @ApiImplicitParam(value = "赛事id", name = "id", dataType = "int", required = true), + }) + public ResultUtil paymentCompetitionCourseList(Integer id){ try { Integer uid = tokenUtil.getUserIdFormRedis(); if(null == uid){ return ResultUtil.tokenErr(); } - return cttService.paymentCompetition(uid, paymentCompetitionVo); + return cttService.paymentCompetitionCourseList(uid, id); }catch (Exception e){ e.printStackTrace(); return ResultUtil.runErr(); @@ -215,6 +428,7 @@ PaymentCompetition paymentCompetition = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", code).eq("payType", 1)); if(paymentCompetition.getPayStatus() == 1){ + paymentCompetition.setAppUserId(null); paymentCompetition.setPayStatus(2); paymentCompetition.setPayTime(new Date()); paymentCompetition.setPayOrderNo(transaction_id); @@ -252,6 +466,7 @@ PaymentCompetition paymentCompetition = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", code).eq("payType", 2)); if(paymentCompetition.getPayStatus() == 1){ + paymentCompetition.setAppUserId(null); paymentCompetition.setPayStatus(2); paymentCompetition.setPayTime(new Date()); paymentCompetition.setPayOrderNo(trade_no); @@ -279,8 +494,8 @@ @ApiOperation(value = "获取已报名赛事列表", tags = {"APP-赛事活动列表"}) @ApiImplicitParams({ @ApiImplicitParam(value = "类型(0=全部,1=未开始,2=进行中,3=已结束,4=已取消)", name = "type", dataType = "int", required = true), - @ApiImplicitParam(value = "页码,首页1", name = "pageSize", dataType = "int", required = true), - @ApiImplicitParam(value = "页条数", name = "pageNo", dataType = "int", required = true), + @ApiImplicitParam(value = "页条数", name = "pageSize", dataType = "int", required = true), + @ApiImplicitParam(value = "页码,首页1", name = "pageNo", dataType = "int", required = true), @ApiImplicitParam(name = "Authorization", value = "用户token(Bearer +token)", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) public ResultUtil<List<CompetitionListVo>> queryMyCompetitionList(Integer type, Integer pageSize, Integer pageNo){ @@ -355,6 +570,7 @@ paymentCompetition.setPayStatus(3); paymentCompetition.setRefundTime(new Date()); paymentCompetition.setRefundOrderNo(refund_id); + paymentCompetition.setAppUserId(null); paymentCompetitionService.updateById(paymentCompetition); Competition competition = cttService.getById(paymentCompetition.getCompetitionId()); @@ -373,7 +589,7 @@ @PostMapping("/base/competition/queryById") - public Competition queryById(Integer id){ + public Competition queryById(@RequestBody Integer id){ try { return cttService.getById(id); }catch (Exception e){ @@ -398,16 +614,18 @@ wrapper.like(Competition::getName,listQuery.getEventName()); } if(ToolUtil.isNotEmpty(listQuery.getTime())){ - wrapper.gt(Competition::getStartTime,listQuery.getTime().split(" - ")[0]+" 00:00:00"); - wrapper.lt(Competition::getEndTime,listQuery.getTime().split(" - ")[1]+" 23:59:59"); + wrapper.lt(Competition::getStartTime,listQuery.getTime().split(" - ")[0]+" 00:00:00"); + wrapper.gt(Competition::getEndTime,listQuery.getTime().split(" - ")[1]+" 23:59:59"); } - if(ToolUtil.isNotEmpty(listQuery.getState())){ - wrapper.eq(Competition::getState,listQuery.getState()); - } + if(ToolUtil.isNotEmpty(listQuery.getRegisterCondition())){ wrapper.eq(Competition::getRegisterCondition,listQuery.getRegisterCondition()); } + wrapper.in(Competition::getStoreId,listQuery.getIds()); + wrapper.eq(Competition::getAuditStatus,2); + wrapper.orderByDesc(Competition::getInsertTime); + Page<Competition> page = cttService.page(competitionPage, wrapper); return page; }catch (Exception e){ @@ -415,5 +633,223 @@ return new Page<Competition>(); } } + @PostMapping("/base/competition/listAudit") + public Page<Competition> listAudit(@RequestBody ListQuery listQuery){ + try { + Page<Competition> competitionPage = new Page<>(listQuery.getOffset(),listQuery.getLimit()); + LambdaQueryWrapper<Competition> wrapper = new LambdaQueryWrapper<>(); + if(ToolUtil.isNotEmpty(listQuery.getProvinceCode())){ + wrapper.eq(Competition::getProvinceCode,listQuery.getProvinceCode()); + } + if(ToolUtil.isNotEmpty(listQuery.getCityCode())){ + wrapper.eq(Competition::getCityCode,listQuery.getCityCode()); + } + if(ToolUtil.isNotEmpty(listQuery.getEventName())){ + wrapper.like(Competition::getName,listQuery.getEventName()); + } + if(ToolUtil.isNotEmpty(listQuery.getState())){ + wrapper.eq(Competition::getAuditStatus,listQuery.getState()); + } + if(ToolUtil.isNotEmpty(listQuery.getRegisterCondition())){ + wrapper.eq(Competition::getRegisterCondition,listQuery.getRegisterCondition()); + } + wrapper.in(Competition::getStoreId,listQuery.getIds()); + ArrayList<Integer> integers = new ArrayList<>(); + integers.add(1); + integers.add(3); + wrapper.in(Competition::getAuditStatus,integers); + wrapper.orderByDesc(Competition::getInsertTime); + + Page<Competition> page = cttService.page(competitionPage, wrapper); + return page; + }catch (Exception e){ + e.printStackTrace(); + return new Page<Competition>(); + } + } + + + @PostMapping("/base/competition/add") + public void add(@RequestBody Competition competition){ + try { + competition.setInsertTime(new Date()); + cttService.save(competition); + }catch (Exception e){ + e.printStackTrace(); + } + } + + @PostMapping("/base/competition/update") + public void update(@RequestBody Competition competition){ + try { + cttService.updateById(competition); + }catch (Exception e){ + e.printStackTrace(); + } + } + + @PostMapping("/base/competition/cancel") + public void cancel(@RequestBody Integer id){ + try { + Competition byId = cttService.getById(id); + byId.setStatus(4); + cttService.updateById(byId); + }catch (Exception e){ + e.printStackTrace(); + } + } + + + @PostMapping("/base/competition/getPeopleFromId") + public Page<CompetitionUser> getPeopleFromId(@RequestBody GetPeopleQuery getPeopleQuery){ + try { + Page<UserCompetition> participantPage = new Page<>(getPeopleQuery.getOffset(),getPeopleQuery.getLimit()); + Page<CompetitionUser> page = participantService.getPeopleFromId(participantPage,getPeopleQuery.getId(),getPeopleQuery.getState()); + return page; + }catch (Exception e){ + e.printStackTrace(); + return null; + } + } + @PostMapping("/base/competition/getPeoples") + @ResponseBody + public List<CompetitionUser> getPeoples(@RequestBody GetPeopleQuery getPeopleQuery){ + List<CompetitionUser> list = participantService.getPeoples( + getPeopleQuery.getId(),getPeopleQuery.getState()); + return list; + } + + + + @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