java/PlayPai.git

			@@ -20,4 +20,7 @@

			@PostMapping("/base/competition/getCancelOrderOfUserPay")
			public List<PaymentCompetition> getCancelOrderOfUserPayRecord(@RequestBody Integer appUserId);

			@PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
			List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId);
			}

			@@ -5,6 +5,8 @@
			import com.dsh.account.entity.RechargeRecords;
			import com.dsh.account.entity.TAppUser;
			import com.dsh.account.enums.RechargeRecordEnum;
			import com.dsh.account.feignclient.competition.DeductionCompetitionsClient;
			import com.dsh.account.feignclient.competition.model.PaymentCompetition;
			import com.dsh.account.feignclient.course.CoursePaymentClient;
			import com.dsh.account.feignclient.course.model.TCoursePackagePayment;
			import com.dsh.account.feignclient.other.RechargeConfigClient;
			@@ -51,6 +53,9 @@
			private CoursePaymentClient cpClient;

			@Autowired
			private DeductionCompetitionsClient deducClient;

			@Autowired
			private PayMoneyUtil payMoneyUtil;


			@@ -63,7 +68,7 @@
			RechargeDetailsVo vo = new RechargeDetailsVo();
			List<RechargeDetailsVo.RechargesDetail> details = new ArrayList<>();
			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM-dd HH:mm");
			// TODO: 2023/7/11 充值明细查询

			Date monthStart = null;
			Date monthEnd = null;
			if (StringUtils.hasText(yearMonth)) {
			@@ -81,7 +86,16 @@
			vo.setWpGold(0);
			}
			// 1.赛事报名

			List<PaymentCompetition> playPaiFGoldPayRecord = deducClient.getPlayPaiFGoldPayRecord(appUserId);
			if (playPaiFGoldPayRecord.size() > 0 ){
			for (PaymentCompetition competition : playPaiFGoldPayRecord) {
			RechargeDetailsVo.RechargesDetail consumeDetail = new RechargeDetailsVo.RechargesDetail();
			consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg() );
			consumeDetail.setConsumeTime(simpleDateFormat.format(competition.getInsertTime()));
			consumeDetail.setConsumeAmount("-" + competition.getAmount());
			details.add(consumeDetail);
			}
			}
			// 2.课包购买
			List<TCoursePackagePayment> appuserCourseList = cpClient.getAppuserCourseList(appUserId);
			if (appuserCourseList.size() > 0){

			@@ -87,6 +87,15 @@
			}


			@PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
			public List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId){
			return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
			.eq("payType",3)
			.eq("appUserId",appUserId)
			.eq("payStatus",3));
			}



			@PostMapping("/base/competition/getCompetitionsDetails")
			public List<PurchaseRecordVo> getStuSourseList(@RequestBody GetStuSourseList sourseList){

			@@ -22,4 +22,7 @@
			@PostMapping("/base/competition/getCancelOrderOfUserPay")
			public List<PaymentCompetition> getCancelOrderOfUserPayRecord(@RequestBody Integer appUserId);

			@PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
			List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId);

			}

	cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史