Merge remote-tracking branch 'origin/master'

liujie

2023-08-08 5592de9cf80aa78486775a72a6224973c93146da

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

@@ -75,29 +75,30 @@
    private AppUserClient appUserClient;


    @ResponseBody
    @PostMapping("/base/competition/getPayedCompetitions")
    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",requestVo.getAppUserId())
                .eq("payStatus",2)
                .between("payTime",requestVo.getMonthStart(),requestVo.getMonthEnd()));
    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 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",requestVo.getAppUserId())
                .eq("payStatus",3)
                .between("refundTime",requestVo.getMonthStart(),requestVo.getMonthEnd()));
    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;
    }


@@ -441,6 +442,40 @@
            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::getProvinceCode,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")