From efd48fe10bde8a50106aedf60ea6dc7f1e74e264 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 10 十二月 2025 14:26:15 +0800
Subject: [PATCH] bug修改
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 180 ++++++++++++++++++-----------------------------------------
1 files changed, 56 insertions(+), 124 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
index fca703b..2d62c15 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -36,8 +36,10 @@
import com.dsh.course.model.*;
import com.dsh.course.service.*;
import com.dsh.course.util.*;
+import com.dsh.course.util.wx.WxV3PayConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -880,6 +882,7 @@
}
+ System.err.println("课程报名！！！");
if (paymentCourseVo.getPayType() == 1) {//微信支付
return weChatPaymentCourse(uid, price, paymentCourseVo);
}
@@ -919,6 +922,7 @@
coursePackageOrder.setAppUserId(uid);
coursePackageOrder.setStudentIds(paymentCourseVo.getStudentIds());
coursePackageOrder.setCoursePackageId(paymentCourseVo.getId());
+ coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId());
coursePackageOrder.setPayType(paymentCourseVo.getPayType());
coursePackageOrder.setClassHours(coursePackagePaymentConfig.getClassHours());
coursePackageOrder.setOriginalPrice(paymentCourseVo.getPrice());
@@ -940,85 +944,35 @@
coursePackageOrder.setAppUserId(null);
coursePackageOrder.setPayUserType(1);
coursePackageOrder.setPayUserId(uid);
+ coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId());
+
coursePackageOrderService.updateById(coursePackageOrder);
}
TCoursePackage byId = coursePackageService.getById(paymentCourseVo.getId());
Integer storeId = byId.getStoreId();
Store store = storeClient.queryStoreById(storeId);
- // 是否分账 0否1是
- int isFenZhang= 1;
+
if (store.getOperatorId()==null || store.getOperatorId()==0){
- // 平台
- isFenZhang = 0;
+ ResultUtil weixinpay = payMoneyUtil.weixinpay("报名运动营", "", code, paymentPrice.toString(),
+ "/base/course/weChatPaymentCourseCallback", "APP", "");
+ return weixinpay;
+ }else{
+ String s = storeClient.getmerchantNumberByOperatorId(store.getOperatorId());
+ System.err.println("微信商户号"+s);
+ if(!StringUtils.hasLength(s)){
+ return ResultUtil.error("运营商未配置微信商户号，获取支付失败!");
+ }
+ return payMoneyUtil.weixinpayV3(s,"报名运动营",code,
+ "/base/course/weChatPaymentCourseCallback1",paymentPrice.toString(),"");
}
- ResultUtil weixinpay = payMoneyUtil.weixinpay("报名运动营"+"-"+isFenZhang, coursePackagePaymentConfig.getId().toString(), code, paymentPrice.toString(),
- "/base/course/weChatPaymentCourseCallback", "APP", "");
- if (weixinpay.getCode() == 200) {
- String finalCode = code;
- new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- 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;
- }
- ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(finalCode, "");
- if (resultUtil.getCode() == 200 && coursePackageOrder1.getPayStatus() == 1) {
- /**
- * SUCCESS—支付成功，
- * REFUND—转入退款，
- * NOTPAY—未支付，
- * CLOSED—已关闭，
- * REVOKED—已撤销（刷卡支付），
- * USERPAYING--用户支付中，
- * PAYERROR--支付失败(其他原因，如银行返回失败)
- */
- Map<String, String> data1 = resultUtil.getData();
- String s = data1.get("trade_state");
- String transaction_id = data1.get("transaction_id");
- if ("REFUND".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
- //有待支付的订单，这里不处理
-// coursePackageOrder1.setState(3);
-// coursePackageOrderService.updateById(coursePackageOrder1);
- break;
- }
- if ("SUCCESS".equals(s)) {
- coursePackageOrder1.setPayStatus(2);
- coursePackageOrder1.setOrderNumber(transaction_id);
- coursePackageOrder1.setAppUserId(null);
- coursePackageOrderService.updateById(coursePackageOrder1);
- //修改课时有效期
- addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
-
-
-
- break;
-
- }
- if ("USERPAYING".equals(s) || "NOTPAY".equals(s)) {
- num++;
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }).start();
- }
- return weixinpay;
+// return payMoneyUtil.weixinpayV3(WxV3PayConfig.smidVx,"报名运动营",code,
+// "/base/course/weChatPaymentCourseCallback1",Long.valueOf(paymentPrice.toString()),
+// coursePackagePaymentConfig.getId()+"");
}
private String smid = "2088330203191220";//平台支付宝商户号
+ private String smidVx = "2088330203191220";//平台微信商户号
/**
* 课程支付宝支付
*
@@ -1038,6 +992,8 @@
CoursePackageOrder coursePackageOrder = new CoursePackageOrder();
coursePackageOrder.setCode(code);
coursePackageOrder.setAppUserId(uid);
+ coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId());
+
coursePackageOrder.setStudentIds(paymentCourseVo.getStudentIds());
coursePackageOrder.setCoursePackageId(paymentCourseVo.getId());
coursePackageOrder.setPayType(paymentCourseVo.getPayType());
@@ -1060,6 +1016,8 @@
coursePackageOrder.setAppUserId(null);
coursePackageOrder.setPayUserType(1);
coursePackageOrder.setPayUserId(uid);
+ coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId());
+
coursePackageOrderService.updateById(coursePackageOrder);
}
// 判断这个课包属于哪个门店 属于哪个运营商 根据运营商 id 获取对应的商户号
@@ -1072,14 +1030,19 @@
if (store.getOperatorId()==0){
smid1 = smid;
}else{
- smid1 = storeClient.getSMIDByOperatorId(store.getOperatorId());
+ smid1 = storeClient.getmerchantNumberAliByOperatorId(store.getOperatorId());
}
+ }
+ if (!StringUtils.hasLength(smid1)){
+ return ResultUtil.error("运营商未配置支付宝商户号，获取支付失败!");
}
ResultUtil alipay = payMoneyUtil.alipay(smid1,"报名运动营", "报名运动营",
coursePackagePaymentConfig.getId().toString(),
code, paymentPrice.toString(), "/base/course/aliPaymentCourseCallback");
if (alipay.getCode() == 200) {
String finalCode = code;
+ String finalSmid = smid1;
+ String finalCode1 = code;
new Thread(new Runnable() {
@Override
public void run() {
@@ -1119,32 +1082,8 @@
coursePackageOrder1.setAppUserId(null);
coursePackageOrderService.updateById(coursePackageOrder1);
addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
- moneyOut(tradeNo,tradeNo,finalCode);
- // 根据课程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());
- payMoneyUtil.confirm1(smid,finalCode,tradeNo,paymentPrice.toString());
- break;
- }else if (operatorId==0){
- String smid ="2088330203191220";
- // 说明是平台的
- payMoneyUtil.confirm1(smid,finalCode,tradeNo,paymentPrice.toString());
- break;
- }else{
- // 当前课程不属于门店 查询这个课程属于哪个门店 属于哪个运营商
- String smidByOperatorId = storeClient.getSMIDByOperatorId(operatorId);
- payMoneyUtil.confirm(smidByOperatorId,finalCode,tradeNo,paymentPrice.toString());
- // 分账处理
- extracted(store, coursePackageOrder1, tradeNo);
- break;
- }
+ Thread.sleep(30000);
+ payMoneyUtil.confirm(finalSmid, finalCode1, tradeNo, paymentPrice.toString());
}
if ("WAIT_BUYER_PAY".equals(s)) {
num++;
@@ -1307,6 +1246,7 @@
coursePackageOrder.setUserCouponId(paymentCourseVo.getCouponId());
coursePackageOrder.setCashPayment(new BigDecimal(paymentPrice));
coursePackageOrder.setPlayPaiCoin(paymentCourseVo.getPrice().intValue());
+ coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId());
coursePackageOrder.setPayUserType(1);
coursePackageOrder.setPayStatus(2);
coursePackageOrder.setPayUserId(appUser.getId());
@@ -1340,6 +1280,10 @@
*/
@Override
public ResultUtil paymentCourseCallback(String code, String trade_no, String attach) throws Exception {
+ System.err.println("进入回调");
+ System.err.println("code"+ code);
+ System.err.println("trade_no"+ trade_no);
+ System.err.println("attach"+trade_no);
CoursePackageOrder coursePackageOrder1 = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
.eq("code", code).eq("state", 1));
if (null == coursePackageOrder1 || coursePackageOrder1.getPayStatus() == 2) {
@@ -1349,36 +1293,17 @@
coursePackageOrder1.setOrderNumber(trade_no);
coursePackageOrder1.setAppUserId(null);
coursePackageOrderService.updateById(coursePackageOrder1);
-
+ TCoursePackage coursePackage = coursePackageService.getById(coursePackageOrder1.getCoursePackageId());
+ // 将用户优惠券修改为已使用
+ Long userCouponId = coursePackageOrder1.getUserCouponId();
+ if (userCouponId!=null){
+ userCouponClient.updateUserCouponStatus(userCouponId,coursePackage.getStoreId(),coursePackage.getSiteId());
+ }
CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getById(attach);
addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
- TCoursePackage byId = coursePackageService.getById(coursePackageOrder1.getCoursePackageId());
- Store store = storeClient.queryStoreById(byId.getStoreId());
+// TCoursePackage byId = coursePackageService.getById(coursePackageOrder1.getCoursePackageId());
+// Store store = storeClient.queryStoreById(byId.getStoreId());
// moneyOut(trade_no,trade_no,code);
- if (store.getOperatorId()!=null && store.getOperatorId()!=0){
- // 休眠两分钟后再调用分账接口 避免提示订单正在处理中
- Thread.sleep(120000);
- // 根据运营商id获取对应运营商分账比例 返回格式: 微信分账比例,支付宝分账比例
- String proportionByOperatorId = storeClient.getProportionByOperatorId(store.getOperatorId());
- String[] split = proportionByOperatorId.split(",");
- String s1 = split[0];
- if (!s1.equals("未设置")){
- BigDecimal bigDecimal = new BigDecimal(s1);
- // 分账比例
- BigDecimal bigDecimal1 = bigDecimal.divide(new BigDecimal(100)).setScale(2);
- // 微信商户号
- String s2 = storeClient.getmerchantNumberByOperatorId(store.getOperatorId());
- String nonce_str = UUIDUtil.getRandomCode(16);
- ResultUtil fenzhang = payMoneyUtil.fenzhang(trade_no, coursePackageOrder1.getCashPayment().multiply(bigDecimal1), s2,nonce_str);
- if (!fenzhang.getCode().equals(200)){
- System.err.println("分账失败 原因是:"+fenzhang.getData().toString());
- }else{
- coursePackageOrder1.setFenzhangNo(fenzhang.getData().toString());
- coursePackageOrder1.setFenzhangOrderNo(nonce_str);
- coursePackageOrderService.updateById(coursePackageOrder1);
- }
- }
- }
return ResultUtil.success();
}
@@ -1386,11 +1311,16 @@
/**
* 支付成功后添加学员课时数据
*
- * @param coursePackagePaymentConfig
*/
@Override
- public void addCoursePackageOrderStudent(Long coursePackageOrderId, CoursePackagePaymentConfig coursePackagePaymentConfig) {
+ public void addCoursePackageOrderStudent(Long coursePackageOrderId, CoursePackagePaymentConfig coursePackagePaymentConfigServiceById) {
+ System.err.println("添加学员课时数据");
+ System.err.println("coursePackageOrderId"+coursePackageOrderId);
+// System.err.println("coursePackagePaymentConfig"+coursePackagePaymentConfig);
+
CoursePackageOrder coursePackageOrder = coursePackageOrderService.getById(coursePackageOrderId);
+ CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getById(coursePackageOrder.getCoursePackagePaymentConfigId());
+
// 发放优惠券
userCouponClient.sendUserCoupon(new SendCouponReq(coursePackageOrder.getAppUserId(), coursePackagePaymentConfig.getCouponIds()));
@@ -1404,6 +1334,7 @@
CoursePackageOrderStudent coursePackageOrderStudent = coursePackageOrderStudentService.getOne(new QueryWrapper<CoursePackageOrderStudent>().eq("studentId", id)
.eq("coursePackageId", coursePackageOrder.getCoursePackageId()).eq("state", 1));
if (null == coursePackageOrderStudent) {
+ System.err.println("新增课包订单学员数据");
coursePackageOrderStudent = new CoursePackageOrderStudent();
coursePackageOrderStudent.setAppUserId(coursePackageOrder.getAppUserId());
coursePackageOrderStudent.setStudentId(Integer.valueOf(id));
@@ -1460,6 +1391,7 @@
courseCounsumService.save(courseCounsum1);
}
} else {
+ System.err.println("更新");
Date useTime = coursePackageOrderStudent.getUseTime();
coursePackageOrderStudent.setTotalClassHours(coursePackageOrderStudent.getTotalClassHours() + coursePackagePaymentConfig.getClassHours());
coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours() + coursePackagePaymentConfig.getClassHours());
--
Gitblit v1.7.1