Merge remote-tracking branch 'origin/master'

liujie

2023-08-08 5592de9cf80aa78486775a72a6224973c93146da

 cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsh.competition.entity.PaymentCompetition;
import com.dsh.competition.feignclient.model.BillingRequest;
import com.dsh.competition.model.CompetitionListVo;
import org.apache.ibatis.annotations.Param;

@@ -24,4 +25,13 @@
     */
    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);

}