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) {
			@@ -1041,7 +1007,7 @@
			return weixinpay;
			}


			private String smid = "2088330203191220";//平台支付宝商户号
			/**
			* 课程支付宝支付
			*
			@@ -1055,6 +1021,7 @@
			CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getById(paymentCourseVo.getCoursePackagePaymentConfigId());
			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
			String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
			String smid1="";
			//生成支付订单
			if (paymentCourseVo.getOrderId()==null){
			CoursePackageOrder coursePackageOrder = new CoursePackageOrder();
			@@ -1083,8 +1050,18 @@
			coursePackageOrder.setPayUserId(uid);
			coursePackageOrderService.updateById(coursePackageOrder);
			}

			ResultUtil alipay = payMoneyUtil.alipay("购买课程", "购买课程", coursePackagePaymentConfig.getId().toString(), code, paymentPrice.toString(), "/base/course/aliPaymentCourseCallback");
			// 判断这个课包属于哪个门店属于哪个运营商根据运营商 id 获取对应的商户号
			Integer coursePackageId = paymentCourseVo.getId();
			TCoursePackage byId = coursePackageService.getById(coursePackageId);
			Store store = storeClient.queryStoreById(byId.getStoreId());
			if (store.getOperatorId() == null ){
			smid1 = smid;
			}else{
			smid1 = storeClient.getSMIDByOperatorId(store.getOperatorId());
			}
			ResultUtil alipay = payMoneyUtil.alipay(smid1,"购买课程", "购买课程",
			coursePackagePaymentConfig.getId().toString(),
			code, paymentPrice.toString(), "/base/course/aliPaymentCourseCallback");
			if (alipay.getCode() == 200) {
			String finalCode = code;
			new Thread(new Runnable() {
			@@ -1092,7 +1069,6 @@
			public void run() {
			try {
			Thread.sleep(1000);

			int num = 1;
			int wait = 0;
			while (num <= 10) {
			@@ -1128,7 +1104,23 @@
			coursePackageOrderService.updateById(coursePackageOrder1);
			addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
			moneyOut(tradeNo,tradeNo,finalCode);
			break;
			// 根据课程id 查询这个课程属于哪个门店属于哪个运营商
			Integer id = paymentCourseVo.getId();
			TCoursePackage byId = coursePackageService.getById(id);
			Integer storeId = byId.getStoreId();
			Store store = storeClient.queryStoreById(storeId);
			Integer operatorId = store.getOperatorId();
			if (operatorId==null){
			String smid ="2088330203191220";
			// 说明是平台的
			payMoneyUtil.confirm(smid,finalCode,tradeNo,paymentPrice.toString());
			break;
			}else{
			// 当前课程不属于门店查询这个课程属于哪个门店属于哪个运营商
			String smidByOperatorId = storeClient.getSMIDByOperatorId(operatorId);
			payMoneyUtil.confirm(smidByOperatorId,finalCode,tradeNo,paymentPrice.toString());
			break;
			}
			}
			if ("WAIT_BUYER_PAY".equals(s)) {
			num++;
			@@ -1300,6 +1292,7 @@
			*
			* @param coursePackagePaymentConfig
			*/
			@Override
			public void addCoursePackageOrderStudent(Long coursePackageOrderId, CoursePackagePaymentConfig coursePackagePaymentConfig) {
			CoursePackageOrder coursePackageOrder = coursePackageOrderService.getById(coursePackageOrderId);
			// 发放优惠券
			@@ -1347,8 +1340,6 @@
			//开始排课
			addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());



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


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


			}



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