java/PlayPai.git

			@@ -26,9 +26,11 @@
			import com.dsh.course.model.vo.response.*;
			import com.dsh.course.service.*;
			import com.dsh.course.util.*;
			import com.dsh.course.util.wx.WxV3PayConfig;
			import com.fasterxml.jackson.core.JsonProcessingException;
			import com.fasterxml.jackson.databind.ObjectMapper;
			import com.obs.services.internal.ServiceException;
			import com.wechat.pay.contrib.apache.httpclient.util.AesUtil;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiImplicitParam;
			import io.swagger.annotations.ApiImplicitParams;
			@@ -44,8 +46,10 @@
			import javax.annotation.Resource;
			import javax.servlet.http.HttpServletRequest;
			import javax.servlet.http.HttpServletResponse;
			import java.io.BufferedReader;
			import java.io.PrintWriter;
			import java.math.BigDecimal;
			import java.nio.charset.StandardCharsets;
			import java.text.ParseException;
			import java.text.SimpleDateFormat;
			import java.time.*;
			@@ -133,8 +137,6 @@

			private final SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");



			@Autowired
			private ICoursePackageOrderStudentService coursePackageOrderStudentService;

			@@ -143,6 +145,16 @@

			@Resource
			private AppUserClient appuClient;

			@Autowired
			private CourseCounsumService courseCounsumService;

			@Autowired
			private TCoursePackagePaymentService coursePackagePaymentService;






			/**
			@@ -194,6 +206,7 @@
			coursePackageOrder.setStatus(1);
			coursePackageOrder.setState(1);
			coursePackageOrder.setInsertTime(new Date());
			coursePackageOrder.setOrderType(1);
			coursePackageOrder.setSalesName(packagePayment.getSalesName());
			coursePackageOrderService.save(coursePackageOrder);
			// 生成排课数据
			@@ -689,11 +702,7 @@
			}


			@Autowired
			private CourseCounsumService courseCounsumService;

			@Autowired
			private TCoursePackagePaymentService coursePackagePaymentService;

			@PostMapping("/base/coursePack/getRecord")
			public List<PurchaseRecordVo> getRecord(@RequestBody RecordTimeRequest recordTimeRequest) {
			@@ -1168,10 +1177,11 @@
			public ResultUtil continuationOperation(ClasspaymentRequest request) {
			try {
			Integer userId = tokenUtil.getUserIdFormRedis();
			System.err.println("续课参数"+request);
			if (null == userId) {
			return ResultUtil.tokenErr();
			}
			Integer couponId = request.getConponId();
			Long couponId = request.getConponId();
			if (couponId == null \|\| couponId == 0) {
			request.setConponId(null);
			}
			@@ -1210,6 +1220,51 @@
			/**
			* 课包续课微信支付回调接口
			*/
			@PostMapping("/base/coursePackage/wechatRegisteredCoursesCallback1")
			public void weChatCallback1(HttpServletRequest request, HttpServletResponse response) {
			try {
			System.err.println("微信回调");
			System.err.println("请求" + request);
			BufferedReader reader = request.getReader();
			String string1 = reader.toString();
			System.err.println("请求reader" + string1);
			StringBuilder requestBody = new StringBuilder();
			String line;
			while ((line = reader.readLine()) != null) {
			requestBody.append(line);
			}
			System.err.println("全部请求体" + requestBody);
			com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(requestBody.toString());
			com.alibaba.fastjson.JSONObject resource = jsonObject.getJSONObject("resource");

			AesUtil aesUtil = new AesUtil(WxV3PayConfig.apiV3Key.getBytes(StandardCharsets.UTF_8));
			String decryptedData = aesUtil.decryptToString(resource.getString("associated_data").getBytes(StandardCharsets.UTF_8), resource.getString("nonce").getBytes(StandardCharsets.UTF_8),
			resource.getString("ciphertext"));
			System.err.println("微信解密的字符串信息" + decryptedData);
			com.alibaba.fastjson.JSONObject jsonInfo = (com.alibaba.fastjson.JSONObject) com.alibaba.fastjson.JSONObject.parse(decryptedData);
			String out_trade_no = jsonInfo.getString("out_trade_no");
			String transaction_id = jsonInfo.getString("transaction_id");
			String trade_state = jsonInfo.getString("trade_state");
			if (trade_state.equals("SUCCESS")) {
			ResultUtil resultUtil = packagePaymentService.insertVipPaymentCallback(out_trade_no, transaction_id);
			if (resultUtil.getCode() == 200) {
			PrintWriter out = response.getWriter();
			out.write("SUCCESS");
			out.flush();
			out.close();
			}
			}
			} catch (Exception e) {
			e.printStackTrace();
			}
			}

			/**
			* 课包续课微信支付回调接口
			*/
			/**
			* 课包续课微信支付回调接口
			*/
			@PostMapping("/base/coursePackage/wechatRegisteredCoursesCallback")
			public void weChatCallback(HttpServletRequest request, HttpServletResponse response) {
			try {
			@@ -1230,8 +1285,6 @@
			e.printStackTrace();
			}
			}


			/**
			* 获取学员剩余课时
			*
			@@ -1572,9 +1625,9 @@
			}

			@PostMapping("/base/coursePack/savePaymentCoursePackage")
			public boolean savePaymentCoursePackage(@RequestBody TCoursePackagePayment packagePayment) {

			return packagePaymentService.save(packagePayment);
			public Long savePaymentCoursePackage(@RequestBody CoursePackageOrder coursePackageOrder) {
			coursePackageOrderService.save(coursePackageOrder);
			return coursePackageOrder.getId();
			}


			@@ -2374,14 +2427,28 @@
			@PostMapping("/base/coursePack/getConsumes")
			List<CourseCounsum> getConsumes(@RequestBody BillingDataRequestVo requestVo) {
			Integer[] integers = {2, 3};
			QueryWrapper<CourseCounsum> courseCounsumQueryWrapper = new QueryWrapper<CourseCounsum>().in("changeType", integers).eq("appUserId", requestVo.getAppUserId());
			QueryWrapper<CourseCounsum> courseCounsumQueryWrapper = new QueryWrapper<CourseCounsum>()
			.in("changeType", integers).eq("appUserId", requestVo.getAppUserId());
			if (requestVo.getMonthEnd() != null) {
			courseCounsumQueryWrapper.ge("insertTime", requestVo.getMonthStart());
			courseCounsumQueryWrapper.le("insertTime", requestVo.getMonthEnd());
			}
			return courseCounsumService.list(courseCounsumQueryWrapper);

			}


			@ResponseBody
			@PostMapping("/base/coursePack/getCoursePackageOrder")
			public List<CoursePackageOrder> getCoursePackageOrder(@RequestBody BillingDataRequestVo requestVo){
			QueryWrapper<CoursePackageOrder> wrapper = new QueryWrapper<CoursePackageOrder>().eq("appUserId", requestVo.getAppUserId())
			.in("payType", Arrays.asList(1, 2, 5, 6)).eq("payStatus", 2).eq("state", 1).eq("orderType", 1);
			return coursePackageOrderService.list(wrapper);
			}







			@ResponseBody
			@@ -2411,7 +2478,8 @@
			// 找出门店的所有课程排出体验
			List<TCoursePackage> list = tcpService.list(new LambdaQueryWrapper<TCoursePackage>()
			.eq(TCoursePackage::getStoreId, courseDetailReq.getStoreId()).ne(TCoursePackage::getType, 3)
			.eq(TCoursePackage::getState, 1).like(TCoursePackage::getClassWeeks, week));
			.eq(TCoursePackage::getState, 1).like(TCoursePackage::getClassWeeks, week)
			.eq(TCoursePackage::getAuditStatus, 2));
			List<Integer> collect = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
			if (collect.size() == 0) {
			collect.add(-1);