From cfb6d6a8bc21bfce63fb1a9158fb394428c4510e Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 02 七月 2026 16:18:07 +0800
Subject: [PATCH] update
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 125 +++++++++++++++++++++--------------------
1 files changed, 64 insertions(+), 61 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
index adc564e..0e49217 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -905,10 +905,13 @@
money = BigDecimal.valueOf((Double) amount);
}
}
-
- return AlipayPayment(code, money);
+ try {
+ return AlipayPayment(code, money, request.getLessonId());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
case 3:
- System.err.println("选择");
PlaypaiGoldPayment(appUser, code, wpGold);
break;
default:
@@ -957,13 +960,13 @@
// System.err.println(v1);
// System.err.println(multiply);
// }
- public ResultUtil AlipayPayment(String code, BigDecimal request) {
+ public ResultUtil AlipayPayment(String code, BigDecimal request, Integer coursePackageId) {
// 二级商户商户号
String smidUser;
TCoursePackagePaymentMapper baseMapper1 = this.baseMapper;
- TCoursePackagePayment coursePackagePayment = baseMapper1.getCoursePackagePaymentByCode(code);
+// TCoursePackagePayment coursePackagePayment = baseMapper1.getCoursePackagePaymentByCode(code);
// 判断这个课包属于哪个门店 属于哪个运营商 根据运营商 id 获取对应的商户号
- Integer coursePackageId = coursePackagePayment.getCoursePackageId();
+// Integer coursePackageId = coursePackagePayment.getCoursePackageId();
TCoursePackage byId = coursePackageService.getById(coursePackageId);
Store store = storeClient.queryStoreById(byId.getStoreId());
String smid1 = "";
@@ -979,61 +982,61 @@
}
ResultUtil alipay = payMoneyUtil.alipay(smid1, "课包购买", "课包购买", "", code, request.toString(),
"/base/coursePackage/alipayRegisteredCoursesCallback");
- if (alipay.getCode() == 200) {
- String finalCode = code;
- String finalSmid = smid1;
- new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- Thread.sleep(1000);
- int num = 1;
- int wait = 0;
- while (num <= 10) {
- int min = 5000;
- wait += (min * num);
- Thread.sleep(wait);
- CoursePackageOrder coursePackageOrder1 = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
- .eq("code", finalCode).eq("state", 1));
- if (coursePackageOrder1.getPayStatus() == 2) {
- break;
- }
- AlipayTradeQueryResponse alipayTradeQueryResponse = payMoneyUtil.queryALIOrder(finalCode);
- if (null != alipayTradeQueryResponse) {
- /**
- * WAIT_BUYER_PAY（交易创建，等待买家付款）、
- * TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
- * TRADE_SUCCESS（交易支付成功）、
- * TRADE_FINISHED（交易结束，不可退款）
- */
- String s = alipayTradeQueryResponse.getTradeStatus();
-
- String tradeNo = alipayTradeQueryResponse.getTradeNo();
- if ("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10) {
- //有待支付的订单，这里不处理
-// coursePackageOrder1.setState(3);
-// coursePackageOrderService.updateById(coursePackageOrder1);
- break;
- }
- if ("TRADE_SUCCESS".equals(s)) {
- coursePackagePayment.setPayStatus(2);
- coursePackagePayment.setOrderNumber(tradeNo);
- baseMapper1.updateById(coursePackagePayment);
- Thread.sleep(30000);
- payMoneyUtil.confirm(finalSmid, code, tradeNo, request.toString());
- break;
- }
- if ("WAIT_BUYER_PAY".equals(s)) {
- num++;
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }).start();
- }
+// if (alipay.getCode() == 200) {
+// String finalCode = code;
+// String finalSmid = smid1;
+// new Thread(new Runnable() {
+// @Override
+// public void run() {
+// try {
+// Thread.sleep(1000);
+// int num = 1;
+// int wait = 0;
+// while (num <= 10) {
+// int min = 5000;
+// wait += (min * num);
+// Thread.sleep(wait);
+// CoursePackageOrder coursePackageOrder1 = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
+// .eq("code", finalCode).eq("state", 1));
+// if (coursePackageOrder1.getPayStatus() == 2) {
+// break;
+// }
+// AlipayTradeQueryResponse alipayTradeQueryResponse = payMoneyUtil.queryALIOrder(finalCode);
+// if (null != alipayTradeQueryResponse) {
+// /**
+// * WAIT_BUYER_PAY（交易创建，等待买家付款）、
+// * TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
+// * TRADE_SUCCESS（交易支付成功）、
+// * TRADE_FINISHED（交易结束，不可退款）
+// */
+// String s = alipayTradeQueryResponse.getTradeStatus();
+//
+// String tradeNo = alipayTradeQueryResponse.getTradeNo();
+// if ("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10) {
+// //有待支付的订单，这里不处理
+//// coursePackageOrder1.setState(3);
+//// coursePackageOrderService.updateById(coursePackageOrder1);
+// break;
+// }
+// if ("TRADE_SUCCESS".equals(s)) {
+// coursePackagePayment.setPayStatus(2);
+// coursePackagePayment.setOrderNumber(tradeNo);
+// baseMapper1.updateById(coursePackagePayment);
+// Thread.sleep(30000);
+// payMoneyUtil.confirm(finalSmid, code, tradeNo, request.toString());
+// break;
+// }
+// if ("WAIT_BUYER_PAY".equals(s)) {
+// num++;
+// }
+// }
+// }
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
+// }).start();
+// }
return alipay;
}
--
Gitblit v1.7.1