| | |
| | | import com.dsh.account.feignclient.activity.UserConponClient; |
| | | import com.dsh.account.feignclient.activity.model.*; |
| | | import com.dsh.account.feignclient.competition.DeductionCompetitionsClient; |
| | | import com.dsh.account.feignclient.competition.model.BillingDataRequestVo; |
| | | import com.dsh.account.feignclient.competition.model.PaymentCompetition; |
| | | import com.dsh.account.feignclient.course.CoursePackageClient; |
| | | import com.dsh.account.feignclient.course.CoursePackageConfigClient; |
| | |
| | | course.setTotalNums(ToolUtil.isEmpty(tCoursePackagePayment.getTotalCourseNums()) ? 0 : tCoursePackagePayment.getTotalCourseNums()); |
| | | course.setDeductedNums(ToolUtil.isEmpty(tCoursePackagePayment.getDeductionNums()) ? 0 : tCoursePackagePayment.getDeductionNums()); |
| | | course.setRemainingNums(ToolUtil.isEmpty(tCoursePackagePayment.getResidueNums())? 0 : tCoursePackagePayment.getResidueNums()); |
| | | course.setPeriodOfValidity(tCoursePackagePayment.getPeriodOfValidity()); |
| | | courseList.add(course); |
| | | } |
| | | } |
| | |
| | | }else { |
| | | benefirVo.setIsMember("普通用户"); |
| | | } |
| | | benefirVo.setCommodities(mcClient.getConvertibleGoods()); |
| | | List<IntegralCommodity> convertibleGoods = mcClient.getConvertibleGoods(); |
| | | benefirVo.setCommodities(convertibleGoods); |
| | | benefirVo.setImage(icfgClient.getImageConfig()); |
| | | return benefirVo; |
| | | } |
| | |
| | | monthStart = DateTimeHelper.getCurrentMouthStart(); |
| | | monthEnd = DateTimeHelper.getCurrentMouthEnd(); |
| | | } |
| | | |
| | | BillingDataRequestVo requestVo = new BillingDataRequestVo(); |
| | | requestVo.setMonthStart(monthStart); |
| | | requestVo.setMonthEnd(monthEnd); |
| | | requestVo.setAppUserId(appUserId); |
| | | // 1.赛事报名 |
| | | List<PaymentCompetition> allCompetitionPayRecord = deducClient.getAllCompetitionPayRecord(appUserId); |
| | | List<PaymentCompetition> allCompetitionPayRecord = deducClient.getAllCompetitionPayRecord(requestVo); |
| | | if (allCompetitionPayRecord.size() > 0 ){ |
| | | for (PaymentCompetition paymentCompetition : allCompetitionPayRecord) { |
| | | ConsumeDetail consumeDetail = new ConsumeDetail(); |
| | |
| | | consumeDetail.setConsumeTime(simpleDateFormat.format(paymentCompetition.getInsertTime())); |
| | | consumeDetail.setConsumeAmount("-" + paymentCompetition.getAmount()); |
| | | details.add(consumeDetail); |
| | | consumeDetail.setType(1); |
| | | } |
| | | } |
| | | // 2.取消赛事报名 |
| | | List<PaymentCompetition> cancelOrderOfUserPayRecord = deducClient.getCancelOrderOfUserPayRecord(appUserId); |
| | | List<PaymentCompetition> cancelOrderOfUserPayRecord = deducClient.getCancelOrderOfUserPayRecord(requestVo); |
| | | if (cancelOrderOfUserPayRecord.size() > 0 ){ |
| | | for (PaymentCompetition paymentCompetition : cancelOrderOfUserPayRecord) { |
| | | ConsumeDetail consumeDetail = new ConsumeDetail(); |
| | | consumeDetail.setConsumeName(RechargeRecordEnum.CANCEL_EVENT_REGISTRATION.getMsg()); |
| | | consumeDetail.setConsumeTime(simpleDateFormat.format(paymentCompetition.getInsertTime())); |
| | | consumeDetail.setConsumeAmount("+" + paymentCompetition.getAmount()); |
| | | consumeDetail.setType(1); |
| | | details.add(consumeDetail); |
| | | } |
| | | } |
| | | // 3.课包购买 |
| | | List<TCoursePackagePayment> amountPayRecord = paymentClient.getAmountPayRecord(appUserId); |
| | | List<TCoursePackagePayment> amountPayRecord = paymentClient.getAmountPayRecord(requestVo); |
| | | if (amountPayRecord.size() > 0 ){ |
| | | for (TCoursePackagePayment coursePackagePayment : amountPayRecord) { |
| | | ConsumeDetail consumeDetail = new ConsumeDetail(); |
| | | consumeDetail.setConsumeName(RechargeRecordEnum.COURSE_PACKAGE_PURCHASE.getMsg()); |
| | | consumeDetail.setConsumeTime(simpleDateFormat.format(coursePackagePayment.getInsertTime())); |
| | | consumeDetail.setConsumeAmount("-" + coursePackagePayment.getCashPayment()); |
| | | consumeDetail.setType(2); |
| | | details.add(consumeDetail); |
| | | } |
| | | } |
| | | // 4.场地预约 |
| | | List<SiteBooking> allSiteBookingList = stClient.getAllSiteBookingList(appUserId); |
| | | List<SiteBooking> allSiteBookingList = stClient.getAllSiteBookingList(requestVo); |
| | | if (allSiteBookingList.size() > 0){ |
| | | for (SiteBooking booking : allSiteBookingList) { |
| | | ConsumeDetail consumeDetail = new ConsumeDetail(); |
| | |
| | | consumeDetail.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.getMsg()); |
| | | consumeDetail.setConsumeAmount("-" + booking.getPayMoney()); |
| | | consumeDetail.setConsumeTime(simpleDateFormat.format(booking.getPayTime())); |
| | | consumeDetail.setType(2); |
| | | }else { |
| | | consumeDetail.setConsumeName(RechargeRecordEnum.CANCEL_VENUE_RESERVATION.getMsg()); |
| | | consumeDetail.setConsumeAmount("+" + booking.getPayMoney()); |
| | | consumeDetail.setConsumeTime(simpleDateFormat.format(booking.getCancelTime())); |
| | | consumeDetail.setType(1); |
| | | } |
| | | details.add(consumeDetail); |
| | | } |
| | |
| | | consumeDetail.setConsumeName(RechargeRecordEnum.ANNUAL_MEMBERSHIP.getMsg()); |
| | | consumeDetail.setConsumeTime(simpleDateFormat.format(vipPayment.getInsertTime())); |
| | | consumeDetail.setConsumeAmount("-" + vipPayment.getAmount()); |
| | | consumeDetail.setType(2); |
| | | details.add(consumeDetail); |
| | | } |
| | | } |
| | |
| | | consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.getMsg() + ":" + rechargeRecord.getPlayPaiCoins()); |
| | | consumeDetail.setConsumeTime(simpleDateFormat.format(rechargeRecord.getInsertTime())); |
| | | consumeDetail.setConsumeAmount("-" + rechargeRecord.getAmount()); |
| | | consumeDetail.setType(2); |
| | | details.add(consumeDetail); |
| | | } |
| | | } |
| | |
| | | return date2.compareTo(date1); |
| | | } |
| | | }); |
| | | |
| | | if (ToolUtil.isNotEmpty(recordId)){ |
| | | details = details.stream() |
| | | .filter(response -> Objects.equals(response.getType(), recordId)) |
| | | .collect(Collectors.toList()); |
| | | } |
| | | } |
| | | return details; |
| | | } |