From 232d3efb20f87f9c60faeda7bae4bc96e5687bd3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 19:19:47 +0800
Subject: [PATCH] 10.12
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index ce9f065..b03f406 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/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;
}
--
Gitblit v1.7.1