java/PlayPai.git

			@@ -80,7 +80,7 @@
			@Override
			public List<RechargesDetail> getAppUserRechargeRecord(String yearMonth, Integer recordId, Integer appUserId,Integer pageNum,Integer pageSize) {
			List<RechargesDetail> details = new ArrayList<>();
			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM-dd HH:mm");
			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");

			Date monthStart = null;
			Date monthEnd = null;
			@@ -96,12 +96,32 @@
			List<PaymentCompetition> playPaiFGoldPayRecord = deducClient.getPlayPaiFGoldPayRecord(appUserId);
			if (playPaiFGoldPayRecord.size() > 0 ){
			for (PaymentCompetition competition : playPaiFGoldPayRecord) {
			RechargesDetail consumeDetail = new RechargesDetail();
			consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg() );
			consumeDetail.setConsumeTime(simpleDateFormat.format(competition.getInsertTime()));
			consumeDetail.setConsumeAmount("-" + competition.getAmount());
			consumeDetail.setRecordId(2);
			details.add(consumeDetail);
			if (competition.getPayStatus()==2) {
			RechargesDetail consumeDetail = new RechargesDetail();
			consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg());
			consumeDetail.setConsumeTime(simpleDateFormat.format(competition.getInsertTime()));
			consumeDetail.setConsumeAmount("-" + competition.getAmount());
			consumeDetail.setRecordId(2);
			details.add(consumeDetail);
			}else {


			RechargesDetail consumeDetail1 = new RechargesDetail();
			consumeDetail1.setConsumeName(RechargeRecordEnum.CANCEL_EVENT_REGISTRATION.getMsg());
			consumeDetail1.setConsumeTime(simpleDateFormat.format(competition.getRefundTime()));
			consumeDetail1.setConsumeAmount("+" + competition.getAmount());
			consumeDetail1.setRecordId(1);
			details.add(consumeDetail1);

			RechargesDetail consumeDetail = new RechargesDetail();
			consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg());
			consumeDetail.setConsumeTime(simpleDateFormat.format(competition.getInsertTime()));
			consumeDetail.setConsumeAmount("-" + competition.getAmount());
			consumeDetail.setRecordId(2);
			details.add(consumeDetail);


			}
			}
			}
			// 2.课包购买
			@@ -150,9 +170,9 @@
			if (rechargeRecords.size() > 0) {
			for (RechargeRecords rechargeRecord : rechargeRecords) {
			RechargesDetail consumeDetail = new RechargesDetail();
			consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.name() + "：" + rechargeRecord.getPlayPaiCoins());
			consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.getMsg() + "：￥" + rechargeRecord.getAmount());
			consumeDetail.setConsumeTime(simpleDateFormat.format(rechargeRecord.getInsertTime()));
			consumeDetail.setConsumeAmount("+" + rechargeRecord.getAmount());
			consumeDetail.setConsumeAmount("+" + rechargeRecord.getPlayPaiCoins());
			consumeDetail.setRecordId(1);
			details.add(consumeDetail);
			}
			@@ -182,11 +202,29 @@
			//一页五条
			int size = pageSize;


			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
			List<RechargesDetail> filteredList = new ArrayList<>();
			for (RechargesDetail detail : details) {
			try {
			Date consumeTime = dateFormat.parse(detail.getConsumeTime());
			if (consumeTime.after(monthStart) && consumeTime.before(monthEnd)) {
			String substring = detail.getConsumeTime().substring(5);
			detail.setConsumeTime(substring);
			filteredList.add(detail);
			}
			} catch (ParseException e) {
			e.printStackTrace();
			}
			}



			//分页
			details = details.stream().skip((pageNo - 1) * size).limit(size).
			filteredList = filteredList.stream().skip((pageNo - 1) * size).limit(size).
			collect(Collectors.toList());

			return details;
			return filteredList;
			}

			@Override
			@@ -283,15 +321,16 @@
			records.setOrderNumber(tradeNo);
			rereMapper.updateById(records);

			// RechargeRecords rechargeRecords = rereMapper.selectOne(new QueryWrapper<RechargeRecords>()
			// .eq("code", code));
			// if (rechargeRecords.getPayStatus() == 2){
			// break;
			// }
			//
			// TAppUser tAppUser = tappMapper.selectById(rechargeRecords.getAppUserId());
			// tAppUser.setPlayPaiCoins(null == tAppUser.getPlayPaiCoins()? rechargeRecords.getPlayPaiCoins(): tAppUser.getPlayPaiCoins() +rechargeRecords.getPlayPaiCoins() );
			// tappMapper.updateById(tAppUser);
			RechargeRecords rechargeRecords = rereMapper.selectOne(new QueryWrapper<RechargeRecords>()
			.eq("code", code));
			if (rechargeRecords.getPayStatus() == 2){
			TAppUser tAppUser = tappMapper.selectById(rechargeRecords.getAppUserId());
			tAppUser.setPlayPaiCoins(null == tAppUser.getPlayPaiCoins()? rechargeRecords.getPlayPaiCoins(): tAppUser.getPlayPaiCoins() +rechargeRecords.getPlayPaiCoins() );
			tappMapper.updateById(tAppUser);
			break;
			}




			break;