java/PlayPai.git

			@@ -12,6 +12,8 @@
			import com.dsh.course.feignclient.other.StoreClient;
			import com.dsh.course.feignclient.other.model.Store;
			import com.dsh.course.model.BaseVo;
			import com.dsh.course.model.BillingRequest;
			import com.dsh.course.model.BillingRequestVo;
			import com.dsh.course.model.dto.DiscountJsonDto;
			import com.dsh.course.model.vo.CourseDetailRequest;
			import com.dsh.course.model.vo.RegisterCourseVo;
			@@ -169,7 +171,7 @@
			System.out.println(StrUtils.dealStrToList(classWeeks).contains(DateTimeHelper.getDayOfWeek(parse)));
			if (expirationDate.after(parse) && StrUtils.dealStrToList(classWeeks).contains(DateTimeHelper.getDayOfWeek(parse))){
			CourseOfStoreVo storeVo = new CourseOfStoreVo();
			storeVo.setCourseId(packageStudent.getId());
			storeVo.setCourseId(tCoursePackagePayment.getId());
			storeVo.setCourseName(tCoursePackage.getName());
			storeVo.setClassStartTime(tCoursePackage.getClassStartTime());
			storeVo.setClassEndTime(tCoursePackage.getClassEndTime());
			@@ -179,6 +181,7 @@
			storeVo.setLat(store.getLat());
			storeVo.setLon(store.getLon());
			storeVo.setCoursePrice(ToolUtil.isEmpty(paymentConfig.getCashPayment()) ? (double) paymentConfig.getPlayPaiCoin():paymentConfig.getCashPayment());
			storeVo.setStatus(1);
			course.add(storeVo);
			}
			}
			@@ -362,22 +365,36 @@
			}

			@PostMapping("/base/coursePack/allPaymentCourseList")
			public List<TCoursePackagePayment> getAppuserCourseList(@RequestBody Integer appUserId){
			return packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>()
			.eq("appUserId",appUserId)
			.eq("payType",3)
			.eq("payStatus",2)
			.eq("state",1));
			@ResponseBody
			public List<CouponPaymentVo> getAppuserCourseList(@RequestBody Integer appUserId){
			List<CouponPaymentVo> paymentVos = new ArrayList<>();
			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM-dd HH:mm");
			List<TCoursePackagePayment> list = packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>()
			.eq("appUserId", appUserId)
			.eq("payType", 3)
			.eq("payStatus", 2)
			.eq("state", 1));
			if (list.size() > 0 ){
			for (TCoursePackagePayment tCoursePackagePayment : list) {
			CouponPaymentVo couponPaymentVo = new CouponPaymentVo();
			couponPaymentVo.setTime(simpleDateFormat.format(tCoursePackagePayment.getInsertTime()));
			couponPaymentVo.setAmount( tCoursePackagePayment.getPlayPaiCoin());
			paymentVos.add(couponPaymentVo);
			}
			}
			return paymentVos;
			}


			@ResponseBody
			@PostMapping("/base/coursePack/allAmountPayRecordOfUser")
			public List<TCoursePackagePayment> getAmountPayRecord(@RequestBody BillingDataRequestVo billingDataRequestVo){
			return packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>()
			.eq("appUserId",billingDataRequestVo.getAppUserId())
			.notIn("payType",3)
			.eq("payStatus",2)
			.eq("state",1)
			.between("insertTime",billingDataRequestVo.getMonthStart(),billingDataRequestVo.getMonthEnd()));
			public BillingRequestVo getAmountPayRecord(@RequestBody BillingDataRequestVo billingDataRequestVo){
			BillingRequestVo requestVo = new BillingRequestVo();
			List<BillingRequest> billingRequests = packagePaymentService.queryAmountDatas(billingDataRequestVo.getAppUserId(), billingDataRequestVo.getMonthStart(), billingDataRequestVo.getMonthEnd());
			if (billingRequests.size() >0){
			requestVo.setRequests(billingRequests);
			}
			return requestVo;
			}


			@@ -774,6 +791,7 @@

			@PostMapping("/base/coursePack/savePaymentCoursePackage")
			public boolean savePaymentCoursePackage(@RequestBody TCoursePackagePayment packagePayment){
			packagePayment.setInsertTime(new Date());
			return packagePaymentService.save(packagePayment);
			}

			@@ -813,9 +831,9 @@
			@ApiOperation(value = "上课主页-预约操作", tags = {"APP-开始上课"})
			@ApiImplicitParams({
			@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
			@ApiImplicitParam(value = "上课记录id", name = "coursePackId", required = true, dataType = "String"),
			@ApiImplicitParam(value = "课包id", name = "courseID", required = true, dataType = "String"),
			@ApiImplicitParam(value = "时间 yyyy-MM-dd", name = "time", required = true, dataType = "String"),
			@ApiImplicitParam(value = "学员id", name = "time", required = true, dataType = "int"),
			@ApiImplicitParam(value = "学员id", name = "stuId", required = true, dataType = "int"),
			})
			public ResultUtil reverse(String courseID,String time,Integer stuId){
			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
			@@ -824,17 +842,35 @@
			if(null == appUserId){
			return ResultUtil.tokenErr();
			}
			CoursePackageStudent coursePackageStudent = cspsService.getOne(new LambdaQueryWrapper<CoursePackageStudent>()
			.eq(CoursePackageStudent::getId,courseID)
			.eq(CoursePackageStudent::getAppUserId,appUserId)
			.eq(CoursePackageStudent::getStudentId,stuId));
			if (ToolUtil.isEmpty(coursePackageStudent)){
			ResultUtil.error("该用户未购买该课包");
			}
			coursePackageStudent.setReservationStatus(1);
			coursePackageStudent.setInsertTime(simpleDateFormat.parse(time));
			cspsService.updateById(coursePackageStudent);
			TCoursePackagePayment packagePayment = packagePaymentService.getOne(new LambdaQueryWrapper<TCoursePackagePayment>()
			.eq(TCoursePackagePayment::getId,courseID )
			.eq(TCoursePackagePayment::getAppUserId,appUserId)
			.eq(TCoursePackagePayment::getStudentId,stuId)
			);

			if (ToolUtil.isEmpty(packagePayment)){
			return ResultUtil.error("该用户未购买该课包");
			}
			CoursePackageStudent coursePackageStudent = cspsService.getOne(new LambdaQueryWrapper<CoursePackageStudent>()
			.eq(CoursePackageStudent::getCoursePackageId,packagePayment.getCoursePackageId())
			.eq(CoursePackageStudent::getCoursePackagePaymentId,courseID)
			.eq(CoursePackageStudent::getStudentId,stuId)
			.eq(CoursePackageStudent::getAppUserId,appUserId)
			);

			if (ToolUtil.isNotEmpty(coursePackageStudent) && coursePackageStudent.getReservationStatus() == 0){
			coursePackageStudent.setReservationStatus(1);
			coursePackageStudent.setInsertTime(simpleDateFormat.parse(time));
			cspsService.updateById(coursePackageStudent);
			}else {
			coursePackageStudent.setAppUserId(appUserId);
			coursePackageStudent.setStudentId(stuId);
			coursePackageStudent.setCoursePackageId(packagePayment.getCoursePackageId());
			coursePackageStudent.setCoursePackagePaymentId(Long.parseLong(courseID));
			coursePackageStudent.setReservationStatus(1);
			coursePackageStudent.setInsertTime(simpleDateFormat.parse(time));
			cspsService.save(coursePackageStudent);
			}
			return ResultUtil.success();
			}catch (Exception e){
			return ResultUtil.runErr();