java/PlayPai.git

			@@ -133,8 +133,6 @@

			private final SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");



			@Autowired
			private ICoursePackageOrderStudentService coursePackageOrderStudentService;

			@@ -143,6 +141,16 @@

			@Resource
			private AppUserClient appuClient;

			@Autowired
			private CourseCounsumService courseCounsumService;

			@Autowired
			private TCoursePackagePaymentService coursePackagePaymentService;






			/**
			@@ -194,6 +202,7 @@
			coursePackageOrder.setStatus(1);
			coursePackageOrder.setState(1);
			coursePackageOrder.setInsertTime(new Date());
			coursePackageOrder.setOrderType(1);
			coursePackageOrder.setSalesName(packagePayment.getSalesName());
			coursePackageOrderService.save(coursePackageOrder);
			// 生成排课数据
			@@ -594,7 +603,6 @@
			storeVo.setLon(store.getLon());
			storeVo.setCoursePrice(ToolUtil.isEmpty(paymentConfig.getCashPayment()) ? (double) paymentConfig.getPlayPaiCoin() : paymentConfig.getCashPayment());
			storeVo.setStatus(1);
			// 2.0
			storeVo.setAllNum(tCoursePackagePayment.getTotalClassHours());
			storeVo.setLastNum(tCoursePackagePayment.getLaveClassHours());
			storeVo.setUseNum(tCoursePackagePayment.getTotalClassHours() - tCoursePackagePayment.getLaveClassHours());
			@@ -682,7 +690,7 @@
			PurchaseRecordVo recordVo = new PurchaseRecordVo();
			recordVo.setPurchaseAmount("+" + cspackage.getClassHours());
			recordVo.setPurchaseTime(format.format(cspackage.getInsertTime()));
			recordVo.setPurchaseType("购买课包");
			recordVo.setPurchaseType("报名运动营");
			purchaseRecordVos.add(recordVo);
			});
			}
			@@ -690,11 +698,7 @@
			}


			@Autowired
			private CourseCounsumService courseCounsumService;

			@Autowired
			private TCoursePackagePaymentService coursePackagePaymentService;

			@PostMapping("/base/coursePack/getRecord")
			public List<PurchaseRecordVo> getRecord(@RequestBody RecordTimeRequest recordTimeRequest) {
			@@ -1037,7 +1041,7 @@
			}
			}

			// 2.0

			@ResponseBody
			@PostMapping("/api/startCource/payCourse")
			@ApiOperation(value = "课后练习-确认购课", tags = {"APP-开始上课"})
			@@ -1502,7 +1506,6 @@
			appUser.setPlayPaiCoins(appUser.getPlayPaiCoins() - paymentConfig.getPlayPaiCoin());
			auClitn.updateAppUser(appUser);

			// 2.0
			TCourseInfoRecord tCourseInfoRecord = new TCourseInfoRecord();
			tCourseInfoRecord.setUserId(userIdFormRedis);
			tCourseInfoRecord.setCourseId(coursePackage.getCoursePackageId());
			@@ -1517,7 +1520,7 @@
			courseCounsum.setChangeType(1);
			courseCounsum.setNum(packagePayment.getClassHours());
			courseCounsum.setInsertTime(new Date());
			courseCounsum.setReason("购买课包");
			courseCounsum.setReason("报名运动营");
			courseCounsumService.save(courseCounsum);

			} catch (Exception e) {
			@@ -1551,7 +1554,6 @@
			boolean id = packagePaymentService.update(packagePayment, new QueryWrapper<TCoursePackagePayment>()
			.eq("id", packagePayment.getId()));
			if (id) {
			// 2.0
			TCourseInfoRecord tCourseInfoRecord = new TCourseInfoRecord();
			tCourseInfoRecord.setNum(packagePayment.getTotalClassHours());
			tCourseInfoRecord.setName("续课");
			@@ -1575,9 +1577,9 @@
			}

			@PostMapping("/base/coursePack/savePaymentCoursePackage")
			public boolean savePaymentCoursePackage(@RequestBody TCoursePackagePayment packagePayment) {

			return packagePaymentService.save(packagePayment);
			public Long savePaymentCoursePackage(@RequestBody CoursePackageOrder coursePackageOrder) {
			coursePackageOrderService.save(coursePackageOrder);
			return coursePackageOrder.getId();
			}


			@@ -2064,7 +2066,6 @@
			}
			}
			}
			// 2.0
			TCourseInfoRecord tCourseInfoRecord = new TCourseInfoRecord();
			tCourseInfoRecord.setUserId(userId);
			tCourseInfoRecord.setCourseId(courseId);
			@@ -2096,7 +2097,6 @@
			}


			// 2.0 送课时
			@PostMapping("/base/coursePack/sendHours")
			public Integer sendHours(@RequestBody String s) throws ParseException {
			String[] split2 = s.split("_");
			@@ -2321,7 +2321,7 @@
			*/
			@ResponseBody
			@PostMapping("/api/startCource/reverse")
			@ApiOperation(value = "上课主页-预约操作--2.0改请假操作", tags = {"APP-开始上课"})
			@ApiOperation(value = "上课主页-预约操作--改请假操作", tags = {"APP-开始上课"})
			@ApiImplicitParams({
			@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
			@ApiImplicitParam(value = "课包id", name = "courseID", required = true, dataType = "String"),
			@@ -2379,17 +2379,31 @@
			@PostMapping("/base/coursePack/getConsumes")
			List<CourseCounsum> getConsumes(@RequestBody BillingDataRequestVo requestVo) {
			Integer[] integers = {2, 3};
			QueryWrapper<CourseCounsum> courseCounsumQueryWrapper = new QueryWrapper<CourseCounsum>().in("changeType", integers).eq("appUserId", requestVo.getAppUserId());
			QueryWrapper<CourseCounsum> courseCounsumQueryWrapper = new QueryWrapper<CourseCounsum>()
			.in("changeType", integers).eq("appUserId", requestVo.getAppUserId());
			if (requestVo.getMonthEnd() != null) {
			courseCounsumQueryWrapper.ge("insertTime", requestVo.getMonthStart());
			courseCounsumQueryWrapper.le("insertTime", requestVo.getMonthEnd());
			}
			return courseCounsumService.list(courseCounsumQueryWrapper);

			}


			@ResponseBody
			@PostMapping("/base/coursePack/getCoursePackageOrder")
			public List<CoursePackageOrder> getCoursePackageOrder(@RequestBody BillingDataRequestVo requestVo){
			QueryWrapper<CoursePackageOrder> wrapper = new QueryWrapper<CoursePackageOrder>().eq("appUserId", requestVo.getAppUserId())
			.in("payType", Arrays.asList(1, 2, 5, 6)).eq("payStatus", 2).eq("state", 1).eq("orderType", 1);
			return coursePackageOrderService.list(wrapper);
			}







			@ResponseBody
			@PostMapping("/base/coursePack/weeksOfCourseDetailsList")
			public HashMap<String, Object> weeksOfCourseDetailsList(@RequestBody CourseDetailReq courseDetailReq) {
			HashMap<String, Object> map = new HashMap<>();