From f6d15260d3fdcb326869f541a266bc4688a1b101 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 24 六月 2024 15:07:07 +0800
Subject: [PATCH] 优化
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 e88601b..ad368b2 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
@@ -311,9 +311,10 @@
map.put("total", 0);
return map;
}
- List<WorldCupPaymentParticipant> list1 = this.list(new QueryWrapper<WorldCupPaymentParticipant>().in("worldCupPaymentId", collect));
+ List<WorldCupPaymentParticipant> list1 = this.list(new QueryWrapper<WorldCupPaymentParticipant>().in("worldCupPaymentId", collect).orderByDesc("createTime"));
List<Map<String, Object>> list2 = new ArrayList<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
for (WorldCupPaymentParticipant on : list1) {
WorldCupPayment worldCupPayment = worldCupPaymentService.getById(on.getWorldCupPaymentId());
Map<String, Object> map1 = new HashMap<>();
@@ -337,6 +338,7 @@
map1.put("phone", ToolUtil.isEmpty(tStudent.getPhone()) ? appUser.getPhone() : tStudent.getPhone());
map1.put("idcard", tStudent.getIdCard());
map1.put("state", worldCupPayment.getPayStatus() - 1);
+ map1.put("insertTime", sdf1.format(worldCupPayment.getPayTime()));
}else{
Participant participant = participantClient.getParticipant(on.getParticipantId());
if(ToolUtil.isNotEmpty(name) && participant.getName().indexOf(name) == -1){
@@ -356,6 +358,7 @@
map1.put("phone", ToolUtil.isNotEmpty(participant.getPhone()) ? participant.getPhone() : appUser.getPhone());
map1.put("idcard", participant.getIdcard());
map1.put("state", worldCupPayment.getPayStatus() - 1);
+ map1.put("insertTime", sdf1.format(worldCupPayment.getPayTime()));
}
list2.add(map1);
}
--
Gitblit v1.7.1