From 794a2ec5fa219a0a87be0c72bd59602cb9f6c6dc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 05 三月 2024 14:19:08 +0800
Subject: [PATCH] 合并代码
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
index 30e792b..d327581 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
@@ -348,7 +348,7 @@
if(null == worldCup){
return ResultUtil.error("报名数据异常");
}
- if(System.currentTimeMillis() > worldCup.getRegistrationClosingTime().getTime()){
+ if(null != worldCup.getRegistrationClosingTime() && System.currentTimeMillis() > worldCup.getRegistrationClosingTime().getTime()){
return ResultUtil.error("报名时间已结束，无法完成报名");
}
if(System.currentTimeMillis() > worldCup.getEndTime().getTime()){
@@ -364,18 +364,18 @@
Integer isStudent = jsonObject.getInteger("isStudent");
if(isStudent == 1){
TStudent tStudent = studentClient.queryById(id);
- if(worldCup.getStartAge() > Integer.valueOf(sdf.format(tStudent.getBirthday()))){
+ if(worldCup.getStartAge() > (Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(tStudent.getBirthday())))){
return ResultUtil.error("【" + tStudent.getName() + "】年龄不符合要求");
}
- if(worldCup.getEndAge() < Integer.valueOf(sdf.format(tStudent.getBirthday()))){
+ if(worldCup.getEndAge() < (Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(tStudent.getBirthday())))){
return ResultUtil.error("【" + tStudent.getName() + "】年龄不符合要求");
}
}else{
Participant participant = participantClient.getParticipant(id);
- if(worldCup.getStartAge() > Integer.valueOf(sdf.format(participant.getBirthday()))){
+ if(worldCup.getStartAge() > (Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(participant.getBirthday())))){
return ResultUtil.error("【" + participant.getName() + "】年龄不符合要求");
}
- if(worldCup.getEndAge() < Integer.valueOf(sdf.format(participant.getBirthday()))){
+ if(worldCup.getEndAge() < (Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(participant.getBirthday())))){
return ResultUtil.error("【" + participant.getName() + "】年龄不符合要求");
}
}
@@ -411,7 +411,8 @@
worldCupPayment.setEntrant(paymentWorldCup.getIds());
int num = JSON.parseArray(paymentWorldCup.getIds()).size();
//不免费
- if(worldCup.getPayType() != 0){
+ String payType1 = worldCup.getPayType().split(",")[0];
+ if(!"0".equals(payType1)){
Integer payType = paymentWorldCup.getPayType();
//微信
if(payType == 1){
@@ -534,6 +535,24 @@
worldCupPayment.setPayTime(new Date());
worldCupPayment.setUnitPrice(worldCupPayment.getAmount().divide(new BigDecimal(num)));
worldCupPaymentService.save(worldCupPayment);
+
+ //添加报名明细
+ for (int i = 0; i < jsonArray.size(); i++) {
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ Integer id = jsonObject.getInteger("id");
+ //是否是学员（0=否，1=是）
+ Integer isStudent = jsonObject.getInteger("isStudent");
+
+ WorldCupPaymentParticipant worldCupPaymentParticipant = new WorldCupPaymentParticipant();
+ worldCupPaymentParticipant.setWorldCupId(paymentWorldCup.getId());
+ worldCupPaymentParticipant.setWorldCupPaymentId(worldCupPayment.getId());
+ worldCupPaymentParticipant.setAppUserId(paymentWorldCup.getUid());
+ worldCupPaymentParticipant.setParticipantType(isStudent == 0 ? 2 : 1);
+ worldCupPaymentParticipant.setParticipantId(id);
+ worldCupPaymentParticipant.setAlreadyEntered(0);
+ worldCupPaymentParticipantService.save(worldCupPaymentParticipant);
+ }
+
return ResultUtil.success();
}
}else{
@@ -606,6 +625,33 @@
/**
+ * 获取比赛管理列表数据
+ * @param worldCupListAll
+ * @return
+ */
+ @Override
+ public Map<String, Object> getWorldCupListAll(WorldCupListAll worldCupListAll) {
+ Map<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> list = this.baseMapper.getWorldCupListAll(worldCupListAll);
+ for (Map<String, Object> map1 : list) {
+ String maxPeople = map1.get("maxPeople").toString();
+ Integer id = Integer.valueOf(map1.get("id").toString());
+ List<WorldCupPayment> lists = worldCupPaymentService.list(new QueryWrapper<WorldCupPayment>().eq("worldCupId", id).eq("payStatus", 2).eq("state", 1));
+ List<Long> collect = lists.stream().map(WorldCupPayment::getId).collect(Collectors.toList());
+ Integer count = 0;
+ if(collect.size() > 0){
+ count = worldCupPaymentParticipantService.count(new QueryWrapper<WorldCupPaymentParticipant>().in("worldCupPaymentId", collect));
+ }
+ map1.put("maxPeople", maxPeople + " - " + count);
+ }
+ Integer count = this.baseMapper.getWorldCupListAllCount(worldCupListAll);
+ map.put("rows", list);
+ map.put("total", count);
+ return map;
+ }
+
+
+ /**
* 取消赛事后退还费用
* @param id
*/
--
Gitblit v1.7.1