玩湃
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
puzhibing
2023-08-04 624c9eec90d59297800f03276f8518daa1bd9f94 
 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,33 +71,38 @@






    @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()));


    }






    @PostMapping("/base/competition/getPlayPaiFGoldPayRecord")


    public List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId){


        ArrayList<Integer> integers = new ArrayList<>();


        integers.add(1);


        integers.add(2);


        return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()


                .eq("payType",3)


                .in("payType",integers)


                .eq("appUserId",appUserId)


                .eq("payStatus",3));


    }


@@ -112,24 +114,31 @@




        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;


    }




@@ -221,6 +230,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);


@@ -258,6 +268,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);


@@ -285,8 +296,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){


@@ -361,6 +372,7 @@


                    paymentCompetition.setPayStatus(3);


                    paymentCompetition.setRefundTime(new Date());


                    paymentCompetition.setRefundOrderNo(refund_id);


                    paymentCompetition.setAppUserId(null);


                    paymentCompetitionService.updateById(paymentCompetition);




                    Competition competition = cttService.getById(paymentCompetition.getCompetitionId());