From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期一, 04 三月 2024 10:11:21 +0800 Subject: [PATCH] 合并代码 --- cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java b/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java index 35c7a0e..1135a2c 100644 --- a/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java +++ b/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java @@ -1,10 +1,15 @@ package com.dsh.competition.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dsh.competition.entity.Competition; import com.dsh.competition.entity.PaymentCompetition; +import com.dsh.competition.feignclient.model.BillingRequest; import com.dsh.competition.model.CompetitionListVo; +import com.dsh.competition.model.CompetitionQuery; +import com.dsh.competition.model.TCompetition; import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; import java.util.List; /** @@ -16,6 +21,7 @@ /** * 获取已报名赛事列表 + * * @param uid * @param type * @param pageSize @@ -24,4 +30,18 @@ */ List<CompetitionListVo> queryMyCompetitionList(@Param("uid") Integer uid, @Param("type") Integer type, @Param("pageSize") Integer pageSize, @Param("pageNo") Integer pageNo); + + List<BillingRequest> queryDatas(@Param("appUserId") Integer appUserId, + @Param("monthStart") String monthStart, + @Param("monthEnd") String monthEnd); + + List<BillingRequest> queryCancelDatas(@Param("appUserId") Integer appUserId, + @Param("monthStart") String monthStart, + @Param("monthEnd") String monthEnd); + + List<PaymentCompetition> listAll(@Param("query") CompetitionQuery query, @Param("sTime") String sTime, @Param("eTime") String eTime, @Param("amount") BigDecimal amount); + + Integer queryBycode(String code); + + Integer counts(@Param("id") Long id); } -- Gitblit v1.7.1