java/PlayPai.git

			@@ -75,6 +75,9 @@
			if (tCoursePackageDiscounts.size() > 0) {
			for (TCoursePackageDiscount tCoursePackageDiscount : tCoursePackageDiscounts) {
			TCoursePackage coursePackage = tcpMapper.selectById(tCoursePackageDiscount.getCoursePackageId());
			if (coursePackage.getState() == 2) {
			continue;
			}
			// 判断预约人数是否已满
			// Integer maxSubscribeNumber = coursePackage.getMaxSubscribeNumber();
			// Integer integer = tcppMapper.selectCount(new QueryWrapper<TCoursePackagePayment>()
			@@ -157,8 +160,6 @@
			resde.setStoreDistance(s);




			list.add(resde);
			}
			}
			@@ -209,6 +210,10 @@
			if (tCoursePackageDiscounts.size() > 0) {
			for (TCoursePackageDiscount tCoursePackageDiscount : tCoursePackageDiscounts) {
			TCoursePackage coursePackage = tcpMapper.selectById(tCoursePackageDiscount.getCoursePackageId());
			if (coursePackage.getState() == 2) {
			continue;
			}

			// 判断预约人数是否已满
			Integer maxSubscribeNumber = coursePackage.getMaxSubscribeNumber();
			Integer integer = tcppMapper.selectCount(new QueryWrapper<TCoursePackagePayment>()
			@@ -460,11 +465,11 @@
			String classTimeAsString = String.join(" \| ", classTime);



			packageResponse.setTime(classTimeAsString);

			return packageResponse;
			}

			@Override
			public List<DiscountList> queryDiscountListAudit(QueryDiscountList queryDiscountList) {
			Page<DiscountList> discountListPage = new Page<>(queryDiscountList.getOffset(), queryDiscountList.getLimit());
			@@ -506,6 +511,7 @@
			}
			return discountLists;
			}

			@Override
			public List<DiscountList> queryDiscountList(QueryDiscountList queryDiscountList) {
			Page<DiscountList> discountListPage = new Page<>(queryDiscountList.getOffset(), queryDiscountList.getLimit());
			@@ -530,8 +536,7 @@
			type += "会员折扣、";
			}else if(tCoursePackageDiscounts.get(i).getType()==2){
			type += "续课优惠、";
			}
			else if(tCoursePackageDiscounts.get(i).getType()==3){
			} else if (tCoursePackageDiscounts.get(i).getType() == 3) {
			type += "限时折扣、";
			}else if(tCoursePackageDiscounts.get(i).getType()==4){
			type += "赠送课时、";