From a12b0be844b87f9a11573f4807a256307a9c4bb1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 三月 2024 18:24:50 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
index 2e4f746..5b6298e 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
@@ -245,7 +245,7 @@
Participant participant = participantClient.getParticipant(participantId);
participantVo.setId(participant.getId());
participantVo.setName(participant.getName());
- participantVo.setAvatar(appUser.getHeadImg());
+ participantVo.setAvatar(participant.getHeadImg());
int age = Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(participant.getBirthday()));
participantVo.setAge(age);
participantVo.setIdcard(participant.getIdcard());
@@ -296,12 +296,13 @@
for (WorldCupPaymentParticipant on : list1) {
WorldCupPayment worldCupPayment = worldCupPaymentService.getById(on.getWorldCupPaymentId());
Map<String, Object> map1 = new HashMap<>();
+ AppUser appUser = appUserClient.getAppUser(on.getAppUserId());
if(on.getParticipantType() == 1){
TStudent tStudent = studentClient.queryById(on.getParticipantId().intValue());
if(ToolUtil.isNotEmpty(name) && tStudent.getName().indexOf(name) == -1){
continue;
}
- if(ToolUtil.isNotEmpty(phone) && tStudent.getPhone().indexOf(phone) == -1){
+ if(ToolUtil.isNotEmpty(phone) && (ToolUtil.isEmpty(tStudent.getPhone()) ? appUser.getPhone() : tStudent.getPhone()).indexOf(phone) == -1){
continue;
}
if(ToolUtil.isNotEmpty(idcode) && tStudent.getIdCard().indexOf(idcode) == -1){
@@ -312,7 +313,7 @@
map1.put("name", tStudent.getName());
map1.put("gender", tStudent.getSex() == 1 ? "男" : "女");
map1.put("age", Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(tStudent.getBirthday())));
- map1.put("phone", tStudent.getPhone());
+ map1.put("phone", ToolUtil.isEmpty(tStudent.getPhone()) ? appUser.getPhone() : tStudent.getPhone());
map1.put("idcard", tStudent.getIdCard());
map1.put("state", worldCupPayment.getPayStatus() - 1);
}else{
@@ -320,7 +321,7 @@
if(ToolUtil.isNotEmpty(name) && participant.getName().indexOf(name) == -1){
continue;
}
- if(ToolUtil.isNotEmpty(phone) && participant.getPhone().indexOf(phone) == -1){
+ if(ToolUtil.isNotEmpty(phone) && (ToolUtil.isNotEmpty(participant.getPhone()) ? participant.getPhone() : appUser.getPhone()).indexOf(phone) == -1){
continue;
}
if(ToolUtil.isNotEmpty(idcode) && participant.getIdcard().indexOf(idcode) == -1){
@@ -331,7 +332,7 @@
map1.put("name", participant.getName());
map1.put("gender", participant.getGender() == 1 ? "男" : "女");
map1.put("age", Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(participant.getBirthday())));
- map1.put("phone", participant.getPhone());
+ map1.put("phone", ToolUtil.isNotEmpty(participant.getPhone()) ? participant.getPhone() : appUser.getPhone());
map1.put("idcard", participant.getIdcard());
map1.put("state", worldCupPayment.getPayStatus() - 1);
}
@@ -391,7 +392,7 @@
if(ToolUtil.isNotEmpty(name) && tStudent.getName().indexOf(name) == -1){
continue;
}
- if(ToolUtil.isNotEmpty(phone) && tStudent.getPhone().indexOf(phone) == -1){
+ if(ToolUtil.isNotEmpty(phone) && (ToolUtil.isEmpty(tStudent.getPhone()) ? appUser.getPhone() : tStudent.getPhone()).indexOf(phone) == -1){
continue;
}
if(ToolUtil.isNotEmpty(idcard) && tStudent.getIdCard().indexOf(idcard) == -1){
@@ -406,7 +407,7 @@
if(ToolUtil.isNotEmpty(name) && participant.getName().indexOf(name) == -1){
continue;
}
- if(ToolUtil.isNotEmpty(phone) && participant.getPhone().indexOf(phone) == -1){
+ if(ToolUtil.isNotEmpty(phone) && (ToolUtil.isNotEmpty(participant.getPhone()) ? participant.getPhone() : appUser.getPhone()).indexOf(phone) == -1){
continue;
}
if(ToolUtil.isNotEmpty(idcard) && participant.getIdcard().indexOf(idcard) == -1){
--
Gitblit v1.7.1