java/PlayPai.git

			@@ -16,6 +16,7 @@
			import com.dsh.guns.config.UserExt;
			import com.dsh.guns.core.base.controller.BaseController;
			import com.dsh.guns.modular.system.model.*;
			import com.dsh.course.entity.CoursePackageOrderStudent;
			import com.dsh.guns.modular.system.model.TCoursePackagePayment;
			import com.dsh.guns.modular.system.model.dto.CoursePackage;
			import com.dsh.guns.modular.system.service.ICityService;
			@@ -135,6 +136,7 @@
			for (TCoursePackageDiscount tCoursePackageDiscount : tCoursePackageDiscounts) {
			char c = tCoursePackageDiscount.getContent().charAt(0);
			String value1 = String.valueOf(c);

			JSONObject jsonObject ;
			if (value1.equals("[")){
			jsonObject = JSONObject.fromObject(tCoursePackageDiscount.getContent()
			@@ -142,10 +144,10 @@
			}else{
			jsonObject = JSONObject.fromObject(tCoursePackageDiscount.getContent());
			}
			// 获取当前课包价格配置
			Integer coursePackageId1 = tCoursePackagePayment.getCoursePackageId();
			List<CoursePackagePaymentConfig> coursePackagePaymentConfigs = coursePackagePaymentConfigClient.queryCoursePackagePaymentConfigList(coursePackageId1);

			// 获取所选课时的课包价格配置
			List<CoursePackagePaymentConfig> coursePackagePaymentConfigs =
			coursePackagePaymentConfigClient.queryCoursePackagePaymentConfigList1
			(tCoursePackagePayment.getCoursePackageConfigId());
			if (coursePackagePaymentConfigs.size()!=0){
			CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigs.get(0);
			tCoursePackagePayment.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
			@@ -174,7 +176,9 @@
			break;
			case 2:
			// 判断当前用户是否已经购买过当前课包
			List<com.dsh.course.feignClient.course.model.TCoursePackagePayment> result= coursePackagePaymentClient.getByUserIdAndCoursePackageId(tCoursePackagePayment.getAppUserId(),tCoursePackagePayment.getCoursePackageId());
			List<CoursePackageOrderStudent> result=
			coursePackagePaymentClient.getByUserIdAndCoursePackageId(tCoursePackagePayment.getAppUserId(),
			tCoursePackagePayment.getCoursePackageId());
			// 已经购买了
			if (result.size()!=0){
			// 会员续课折扣
			@@ -362,6 +366,14 @@
			return coursePackagePaymentConfigClient.queryCoursePackagePaymentConfigList(id);
			}


			@RequestMapping(value = "/getCoursePackageType")
			@ResponseBody
			public Integer getCoursePackageType(Integer id) {
			TCoursePackage coursePackage = coursePackageClient.queryById(id);
			return coursePackage.getType();
			}

			}