java/XinQuanHealing.git

			@@ -218,6 +218,8 @@
			orderDetailVO.setRemark("微信支付");
			}else if (one.getPayType()==2){
			orderDetailVO.setRemark("支付宝支付");
			}else if (one.getPayType() == 3){
			orderDetailVO.setRemark("IOS内购");
			}
			orderDetailVO.setChangeType(byId.getChangeType());
			orderDetailVO.setAmount(byId.getAmount());
			@@ -248,6 +250,7 @@
			orderDetailVO.setAmount(byId1.getAmount());
			orderDetailVO.setChangeType(byId.getChangeType());
			orderDetailVO.setPaymentTime(byId1.getUpdateTime());
			orderDetailVO.setRemark(byId1.getReason());
			return R.ok(orderDetailVO);

			}
			@@ -277,6 +280,7 @@
			orderDetailVO.setAmount(byId1.getAmount());
			orderDetailVO.setChangeType(byId.getChangeType());
			orderDetailVO.setPaymentTime(byId1.getUpdateTime());
			orderDetailVO.setRemark("银行卡提现");
			}else if (byId.getReason().equals("充值")){
			Order one = remoteOrderService.getOrderById(byId.getOrderId()).getData();
			orderDetailVO.setType("充值");
			@@ -286,7 +290,15 @@
			orderDetailVO.setChangeType(byId.getChangeType());
			orderDetailVO.setAmount(byId.getAmount());
			orderDetailVO.setPaymentTime(one.getPaymentTime());
			return R.ok(orderDetailVO);
			if (one.getPayType()==1){
			orderDetailVO.setRemark("微信支付");
			}else if (one.getPayType()==2){
			orderDetailVO.setRemark("支付宝支付");
			}else if (one.getPayType() == 3){
			orderDetailVO.setRemark("IOS内购");
			}

			return R.ok(orderDetailVO);
			}else if (byId.getReason().equals("分佣收益")){
			Order one = remoteOrderService.getOrderById(byId.getOrderId()).getData();
			if (byId.getChildAppUserId()!=null && one!=null){
			@@ -296,6 +308,7 @@
			orderDetailVO.setChangeType(byId.getChangeType());
			orderDetailVO.setAmount(byId.getAmount());
			orderDetailVO.setRemark(one.getRemark());
			orderDetailVO.setRemark("分佣收益");
			if (one.getCommissionId()!=null){
			AppUser appUserById = appUserService.getById(one.getAppUserId());
			orderDetailVO.setUserName(appUserById.getNickname());
			@@ -311,6 +324,7 @@
			orderDetailVO.setAmount(byId1.getAmount());
			orderDetailVO.setChangeType(byId.getChangeType());
			orderDetailVO.setPaymentTime(byId1.getUpdateTime());
			orderDetailVO.setRemark(byId1.getReason());
			return R.ok(orderDetailVO);
			}else if (byId.getReason().contains("课程")){
			Order data = remoteOrderService.getOrderById(byId.getOrderId()).getData();
			@@ -321,6 +335,8 @@
			orderDetailVO.setAmount(data.getBalance());
			orderDetailVO.setChangeType(byId.getChangeType());
			orderDetailVO.setPaymentTime(data.getPaymentTime());
			if (data1!=null)orderDetailVO.setRemark("课程购买【"+data1.getCourseTitle()+"】");

			}
			return R.ok(orderDetailVO);

			@@ -333,6 +349,7 @@
			orderDetailVO.setAmount(data.getBalance());
			orderDetailVO.setChangeType(2);
			orderDetailVO.setPaymentTime(data.getPaymentTime());
			if (data1!=null)orderDetailVO.setRemark("疗愈购买【"+data1.getMeditationTitle()+"】");
			}
			return R.ok(orderDetailVO);

	xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationEverydayServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWalletRecordController.java	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -53,8 +53,8 @@
			String now = DateUtils.dateTimeNow("HH:mm:ss");
			// 查询播放时间段在当前时间的每日冥想
			Optional<MeditationEveryday> meditationEverydayOpt = this.lambdaQuery()
			.ge(MeditationEveryday::getStartPlayTime, now)
			.le(MeditationEveryday::getEndPlayTime, now)
			.le(MeditationEveryday::getStartPlayTime, now)
			.ge(MeditationEveryday::getEndPlayTime, now)
			.orderByDesc(MeditationEveryday::getUpdateTime)
			.last("limit 1").oneOpt();
			if (!meditationEverydayOpt.isPresent()) {