Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-31 fc5fcf753994834a72564944c117d5ec850f268c

 cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java

@@ -8,10 +8,7 @@
import com.dsh.competition.entity.Participant;
import com.dsh.competition.entity.PaymentCompetition;
import com.dsh.competition.entity.UserCompetition;
import com.dsh.competition.feignclient.model.GetPeopleQuery;
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.feignclient.model.*;
import com.dsh.competition.model.CompetitionInfo;
import com.dsh.competition.model.CompetitionListVo;
import com.dsh.competition.model.PaymentCompetitionVo;
@@ -74,26 +71,28 @@


    @PostMapping("/base/competition/getPayedCompetitions")
    public List<PaymentCompetition> getAllCompetitionPayRecord(@RequestBody Integer appUserId){
    public List<PaymentCompetition> getAllCompetitionPayRecord(@RequestBody BillingDataRequestVo requestVo){
        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",2));
                .eq("appUserId",requestVo.getAppUserId())
                .eq("payStatus",2)
                .between("payTime",requestVo.getMonthStart(),requestVo.getMonthEnd()));
    }


    @PostMapping("/base/competition/getCancelOrderOfUserPay")
    public List<PaymentCompetition> getCancelOrderOfUserPayRecord(@RequestBody Integer appUserId){
    public List<PaymentCompetition> getCancelOrderOfUserPayRecord(@RequestBody BillingDataRequestVo requestVo){
        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));
                .eq("appUserId",requestVo.getAppUserId())
                .eq("payStatus",3)
                .between("refundTime",requestVo.getMonthStart(),requestVo.getMonthEnd()));
    }