java/PlayPai.git

			@@ -75,6 +75,7 @@

			/**
			* 通过课程ids获取课程
			*
			* @return
			*/
			@RequestMapping("/base/course/getCourseByCourseIds")
			@@ -124,8 +125,6 @@
			}




			@ResponseBody
			@PostMapping("/api/course/queryCourseList")
			@ApiOperation(value = "获取课程列表", tags = {"APP-课程列表"})
			@@ -164,8 +163,6 @@
			}




			@ResponseBody
			@PostMapping("/api/course/queryCourseInfo")
			@ApiOperation(value = "获取课程详情", tags = {"APP-课程列表"})
			@@ -188,8 +185,6 @@
			return ResultUtil.runErr();
			}
			}




			@ResponseBody
			@@ -237,6 +232,7 @@

			/**
			* 购买课程微信支付回调
			*
			* @param request
			* @param response
			*/
			@@ -248,21 +244,16 @@
			if(null != map){
			String code = map.get("out_trade_no");
			String transaction_id = map.get("transaction_id");
			String attach = map.get("attach");
			String result = map.get("result");

			List<TCoursePackagePayment> list = coursePackagePaymentService.list(new QueryWrapper<TCoursePackagePayment>().eq("state", 1).eq("code", code).eq("payType", 1));
			TCoursePackagePayment one = list.get(0);
			if(one.getPayStatus() == 1){
			for (TCoursePackagePayment coursePackagePayment : list) {
			coursePackagePayment.setPayStatus(2);
			coursePackagePayment.setOrderNumber(transaction_id);
			}
			coursePackagePaymentService.updateBatchById(list);
			}
			ResultUtil resultUtil = coursePackageService.paymentCourseCallback(code, transaction_id, attach);
			if (resultUtil.getCode() == 200) {
			PrintWriter out = response.getWriter();
			out.write(result);
			out.flush();
			out.close();
			}
			}
			}catch (Exception e){
			e.printStackTrace();
			@@ -272,6 +263,7 @@

			/**
			* 购买课程支付宝回调
			*
			* @param request
			* @param response
			*/
			@@ -279,26 +271,18 @@
			@PostMapping("/base/course/aliPaymentCourseCallback")
			public void aliPaymentCourseCallback(HttpServletRequest request, HttpServletResponse response){
			try {
			System.err.println("=====支付宝回调=======");
			Map<String, String> map = payMoneyUtil.alipayCallback(request);
			if(null != map){
			String code = map.get("out_trade_no");
			String trade_no = map.get("trade_no");

			List<TCoursePackagePayment> list = coursePackagePaymentService.list(new QueryWrapper<TCoursePackagePayment>().eq("state", 1).eq("code", code).eq("payType", 2));
			TCoursePackagePayment one = list.get(0);
			if(one.getPayStatus() == 1){
			for (TCoursePackagePayment coursePackagePayment : list) {
			coursePackagePayment.setPayStatus(1);
			coursePackagePayment.setOrderNumber(trade_no);
			coursePackagePayment.setAppUserId(null);
			}
			coursePackagePaymentService.updateBatchById(list);
			}
			String passback_params = map.get("passback_params");
			ResultUtil resultUtil = coursePackageService.paymentCourseCallback(code, trade_no, passback_params);
			if (resultUtil.getCode() == 200) {
			PrintWriter out = response.getWriter();
			out.write("success");
			out.flush();
			out.close();
			}
			}
			}catch (Exception e){
			e.printStackTrace();
			@@ -306,16 +290,9 @@
			}


			//分账
			public void moneyOut(){



			}


			/**
			* 根据id获取课程数据
			*
			* @param id
			* @return
			*/
			@@ -333,6 +310,7 @@

			/**
			* 根据名称获取数据
			*
			* @param name
			* @return
			*/
			@@ -364,6 +342,7 @@

			/**
			* 获取课程管理列表数据
			*
			* @param queryCourseList
			* @return
			*/
			@@ -378,6 +357,7 @@

			/**
			* 添加课程
			*
			* @param course
			*/
			@ResponseBody
			@@ -391,6 +371,7 @@

			/**
			* 编辑数据
			*
			* @param course
			*/
			@ResponseBody
			@@ -402,6 +383,7 @@

			/**
			* 删除数据
			*
			* @param id
			*/
			@ResponseBody
			@@ -417,6 +399,7 @@

			/**
			* 编辑数据状态
			*
			* @param editCourseState
			*/
			@ResponseBody
			@@ -432,6 +415,7 @@

			/**
			* 根据类型获取数据
			*
			* @param type
			* @return
			*/
			@@ -453,6 +437,7 @@
			return strings;

			}

			// 获取课包商品的价格配置
			@PostMapping("/course/getHoursByPackageId")
			@ResponseBody
			@@ -461,6 +446,7 @@
			.eq("coursePackageId", coursePackageId1));
			return coursePackageId;
			}

			@PostMapping("/course/getHours")
			public List<Integer> getHours(@RequestBody Integer coursePackageId1){
			return coursePackageService.getHours(coursePackageId1);
			@@ -472,6 +458,7 @@
			TCoursePackage byId1 = coursePackageService.getById(byId.getCoursePackageId());
			return byId1;
			}

			@ResponseBody
			@PostMapping("/course/queryByDiscountId1")
			public TCoursePackage queryByDiscountId1(@RequestBody Integer id){
			@@ -486,6 +473,7 @@
			TCoursePackageDiscount byId = discountService.getById(id);
			return byId.getAuditStatus();
			}

			@PostMapping("/course/queryDiscountList")
			public List<DiscountList> queryDiscountList(@RequestBody QueryDiscountList queryDiscountList){
			return discountService.queryDiscountList(queryDiscountList);
			@@ -518,8 +506,10 @@

			return discountService.updateBatchById(list);
			}

			@Autowired
			private ICoursePackagePaymentConfigService packagePaymentConfigService;

			@PostMapping("/course/times")
			public List<SelectDto> times(@RequestBody Integer oneId){
			List<CoursePackagePaymentConfig> list = packagePaymentConfigService.list(new QueryWrapper<CoursePackagePaymentConfig>().eq("coursePackageId",oneId));