java/PlayPai.git

			@@ -265,12 +265,7 @@
			queryWrapper.like("reason", consumeQuery.getReason());

			}

			List<CourseCounsum> list = counsumService.list(queryWrapper);




			// List<CourseCounsum> list = counsumService.list(new QueryWrapper<CourseCounsum>().eq("paymentId", consumeQuery.getPayId()).eq("changeType", consumeQuery.getChangeType()).between("insertTime", consumeQuery.getStart(), consumeQuery.getEnd()).like("reason", consumeQuery.getReason()));
			return list;
			}
			@@ -442,8 +437,8 @@
			CourseCounsum courseCounsum = new CourseCounsum();
			courseCounsum.setInsertTime(new Date());
			if (orinPay.getAppUserId()!=studentPay.getAppUserId()){
			courseCounsum.setReason("赠课");
			}else { courseCounsum.setReason("转课");
			courseCounsum.setReason("课时转移");
			}else { courseCounsum.setReason("课时转移");
			}
			courseCounsum.setNum(laveClassHours);
			courseCounsum.setChangeType(0);
			@@ -463,8 +458,8 @@
			CourseCounsum courseCounsum1 = new CourseCounsum();
			courseCounsum1.setInsertTime(new Date());
			if (orinPay.getAppUserId()!=studentPay.getAppUserId()){
			courseCounsum1.setReason("赠课");
			}else { courseCounsum1.setReason("转课");
			courseCounsum1.setReason("课时转移");
			}else { courseCounsum1.setReason("课时转移");
			}
			courseCounsum1.setNum(laveClassHours);
			courseCounsum1.setChangeType(1);
			@@ -582,7 +577,7 @@

			CourseCounsum courseCounsum = new CourseCounsum();
			courseCounsum.setInsertTime(new Date());
			courseCounsum.setReason("赠课");
			courseCounsum.setReason("课时转移");
			courseCounsum.setNum(orinPay.getLaveClassHours());
			courseCounsum.setChangeType(0);
			courseCounsum.setPaymentId(orinPay.getId());
			@@ -594,7 +589,7 @@

			CourseCounsum courseCounsum1 = new CourseCounsum();
			courseCounsum1.setInsertTime(new Date());
			courseCounsum1.setReason("赠课");
			courseCounsum1.setReason("课时转移");
			courseCounsum1.setNum(orinPay.getLaveClassHours());
			courseCounsum1.setChangeType(1);
			courseCounsum1.setPaymentId(to.getId());