10.12

44323

2023-10-11 232d3efb20f87f9c60faeda7bae4bc96e5687bd3

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

@@ -79,11 +79,33 @@
    @RequestMapping("/base/competition/listAllPayment")
    public List<PaymentCompetition> listAllPayment(@RequestBody CompetitionQuery query){
        List<PaymentCompetition> paymentCompetitions = paymentCompetitionService.listAll(query);
        List<PaymentCompetition> result = new ArrayList<>();
        if (query.getOperatorId()!=null){
            for (PaymentCompetition paymentCompetition : paymentCompetitions) {
                Integer competitionId = paymentCompetition.getCompetitionId();
                Competition byId = cttService.getById(competitionId);
                if (byId!=null){
                    Integer operatorId = byId.getOperatorId();
                    if (operatorId!=null){
                        if (operatorId == query.getOperatorId()){
                            result.add(paymentCompetition);
                        }
                    }
                }
            }
            return result;
        }else if (query.getStoreId()!=null){
            for (PaymentCompetition paymentCompetition : paymentCompetitions) {
                Integer competitionId = paymentCompetition.getCompetitionId();
                Competition byId = cttService.getById(competitionId);
                if (byId!=null){
                    String storeId = byId.getStoreId();
                    if (storeId.contains(query.getStoreId().toString())){
                            result.add(paymentCompetition);
                    }
                }
            }
            return result;
        }
        return paymentCompetitions;
    }