java/PlayPai.git

			@@ -143,12 +143,6 @@
			@Override
			public List<CoursePackageListVo> queryCourseList(Integer uid, CoursePackageList coursePackageList) throws Exception {
			AppUser appUser = appUserClient.queryAppUser(uid);
			// Map<String, String> geocode = gdMapGeocodingUtil.geocode(coursePackageList.getLon(), coursePackageList.getLat());
			// String provinceCode = geocode.get("provinceCode");
			// String cityCode = geocode.get("cityCode");
			// QueryWrapper<TCoursePackage> wrapper = new QueryWrapper<TCoursePackage>().in("status", Arrays.asList(1, 2))
			// .eq("auditStatus", 2).eq("state", 1).eq("provinceCode", provinceCode).eq("cityCode", cityCode);

			QueryWrapper<TCoursePackage> wrapper = new QueryWrapper<TCoursePackage>().in("status", Arrays.asList(1, 2))
			.eq("auditStatus", 2).eq("state", 1);
			if (null != coursePackageList.getCoursePackageTypeId()) {
			@@ -171,7 +165,6 @@
			List<TCoursePackage> list1 = this.list(wrapper.last(" order by sort desc, insertTime desc"));
			Date currentTime = new Date();

			// Filter the list based on the conditions
			List<TCoursePackage> list = list1.stream()
			.filter(coursePackage -> coursePackage.getType() != 2 \|\| currentTime.before(coursePackage.getEndTime()))
			.collect(Collectors.toList());
			@@ -311,35 +304,8 @@
			}
			coursePackageListVo.setPaymentPrice(paymentPrice);

			double vipPrice1 = coursePackageListVo.getVipPrice();
			double originalPrice1 = coursePackageListVo.getOriginalPrice();
			double paymentPrice1 = coursePackageListVo.getPaymentPrice();

			// double minPrice = Math.min(vipPrice1, Math.min(originalPrice1, paymentPrice1));
			// double maxPrice = Math.max(vipPrice1, Math.max(originalPrice1, paymentPrice1));
			// coursePackageListVo.setPaymentPrice(minPrice);
			// coursePackageListVo.setOriginalPrice(maxPrice);
			// System.out.println("Minimum price: " + minPrice);


			// }
			// else{
			// List<TCoursePackageDiscount> list2 = coursePackageDiscountService.list(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", coursePackagePaymentConfig.getId())
			// .eq("type", 1).eq("auditStatus", 2).eq("status",1));
			// Double vipPrice = coursePackagePaymentConfig.getCashPayment();
			// for (TCoursePackageDiscount coursePackageDiscount : list2) {
			// Double num1 = JSON.parseObject(coursePackageDiscount.getContent()).getDouble("discountMember");
			// if(vipPrice.compareTo(num1) > 0){
			// vipPrice = num1;
			// }
			// }
			// coursePackageListVo.setPaymentPrice(vipPrice);
			// coursePackageListVo.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
			// }

			if (coursePackageListVo.getPaymentPrice() < coursePackageListVo.getVipPrice()) {
			coursePackageListVo.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
			// coursePackageListVo.setVipPrice(null);
			}

			if (appUser.getIsVip() == 1) {
			@@ -1335,6 +1301,7 @@
			*
			* @param coursePackagePaymentConfig
			*/
			@Override
			public void addCoursePackageOrderStudent(Long coursePackageOrderId, CoursePackagePaymentConfig coursePackagePaymentConfig) {
			CoursePackageOrder coursePackageOrder = coursePackageOrderService.getById(coursePackageOrderId);
			// 发放优惠券
			@@ -1382,8 +1349,6 @@
			//开始排课
			addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());



			//课时记录
			CourseCounsum courseCounsum = new CourseCounsum();
			courseCounsum.setPaymentId(coursePackageOrderStudent.getId());
			@@ -1402,8 +1367,6 @@
			courseCounsum1.setAppUserId(coursePackageOrder.getAppUserId());
			courseCounsumService.save(courseCounsum1);
			}


			} else {
			Date useTime = coursePackageOrderStudent.getUseTime();
			coursePackageOrderStudent.setTotalClassHours(coursePackageOrderStudent.getTotalClassHours() + coursePackagePaymentConfig.getClassHours());
			@@ -1449,12 +1412,7 @@
			courseCounsum1.setAppUserId(coursePackageOrder.getAppUserId());
			courseCounsumService.save(courseCounsum1);
			}


			}



			}
			if(coursePackage.getType() == 2){
			addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), null, null);