44323
2024-03-13 eadc1f646e81e8ffbe940b13163aee9d107d6663
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
@@ -195,7 +195,7 @@
            Participant participant = participantClient.getParticipant(worldCupPaymentParticipant.getParticipantId());
            worldCupPeopleVo.setName(participant.getName());
            worldCupPeopleVo.setAge(null == participant.getBirthday() ? 0 : Integer.valueOf(sdf.format(new Date())) -Integer.valueOf(sdf.format(participant.getBirthday())));
            worldCupPeopleVo.setAvatar(appUser.getHeadImg());
            worldCupPeopleVo.setAvatar(participant.getHeadImg());
            worldCupPeopleVo.setParticipantType(2);
        }
        return ResultUtil.success(worldCupPeopleVo);
@@ -849,4 +849,19 @@
        }
        return worldCupPaymentParticipantService.getCount(worldCupId, collect);
    }
    /**
     * 获取支付记录
     * @param getWorldCupPayment
     * @return
     */
    @ResponseBody
    @PostMapping("/worldCup/getWorldCupPayment")
    public List<WorldCupPayment> getWorldCupPayment(@RequestBody GetWorldCupPayment getWorldCupPayment){
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        return worldCupPaymentService.list(new QueryWrapper<WorldCupPayment>().eq("appUserId", getWorldCupPayment.getAppUserId())
                .eq("payType", getWorldCupPayment.getPayType()).ne("payStatus", 1).eq("state", 1)
                .last(" and createTime between '" + sdf.format(getWorldCupPayment.getStartTime()) + "' and  '" + sdf.format(getWorldCupPayment.getEndTime()) + "' order by createTime desc"));
    }
}