From 5dc40fcd64b0513150f1d8335ab849e6d8cdc28e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 04 七月 2025 19:42:49 +0800
Subject: [PATCH] 支付版本更新 根据资金流向使用V2或V3服务商版本支付
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 332 ++++++++++++++++++++++++-------------------------------
1 files changed, 146 insertions(+), 186 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 52544e2..40cbbff 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
@@ -37,6 +37,7 @@
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 org.springframework.beans.factory.annotation.Autowired;
@@ -798,11 +799,13 @@
@Override
public ResultUtil ContinuationOrpaymentCourse(Integer userId, ClasspaymentRequest request) {
+ System.err.println("请求参数"+request);
AppUser appUser = appuClient.queryAppUser(userId);
CoursePackageOrder coursePackageOrder = coursePackageOrderService.getById(request.getCoursePayId());
+ System.err.println("上次支付记录"+coursePackageOrder);
String code = "";
- BigDecimal money = coursePackageOrder.getCashPayment();
- Integer wpGold = coursePackageOrder.getPlayPaiCoin();
+ BigDecimal money = BigDecimal.valueOf(request.getCash());
+ Integer wpGold = request.getPlayPaiCoin();
if (coursePackageOrder.getPayStatus() == 1) {
code = coursePackageOrder.getCode();
coursePackageOrder.setPayType(request.getPayType());
@@ -815,11 +818,13 @@
CoursePackagePaymentConfig paymentConfig = cpConfigMapper.selectOne(new QueryWrapper<CoursePackagePaymentConfig>()
.eq("coursePackageId", request.getLessonId())
.eq("classHours", request.getCourseHoursNum()));
+ System.err.println("价格配置"+paymentConfig);
TCoursePackageDiscount coursePackageDiscount = tcpdMapper.selectOne(new QueryWrapper<TCoursePackageDiscount>()
.eq("coursePackageId", request.getLessonId())
.eq("type", 2)
.eq("auditStatus", 1)
.eq("coursePackagePaymentConfigId", paymentConfig.getCoursePackageId()));
+ System.err.println("折扣"+coursePackageDiscount);
if (ToolUtil.isNotEmpty(coursePackageDiscount)) {
String content = coursePackageDiscount.getContent();
JSONObject jsonObject = JSON.parseObject(content);
@@ -837,7 +842,7 @@
newPayment.setAppUserId(appUser.getId());
newPayment.setStudentIds(request.getStuId().toString());
newPayment.setCoursePackageId(request.getLessonId());
- newPayment.setClassHours(coursePackageOrder.getClassHours());
+ newPayment.setClassHours(request.getCourseHoursNum());
newPayment.setOriginalPrice(coursePackageOrder.getOriginalPrice());
if (request.getUseConpon() == 1) {
newPayment.setUserCouponId(Long.valueOf(request.getUseConpon()));
@@ -848,27 +853,37 @@
newPayment.setPayType(request.getPayType());
newPayment.setState(1);
newPayment.setInsertTime(new Date());
+ if (request.getCash()!=null && request.getCash()!=0){
+ newPayment.setCashPayment(BigDecimal.valueOf(request.getCash()));
+ }
+ newPayment.setPlayPaiCoin(request.getPlayPaiCoin());
newPayment.setOrderType(1);
+ newPayment.setUserCouponId(request.getConponId());
coursePackageOrderService.save(newPayment);
code = newPayment.getCode();
}
+ System.err.println("选择");
switch (request.getPayType()) {
case 1:
if (request.getUseConpon() == 1) {
- Coupon coupon = client.queryCouponById(request.getConponId());
- if (coupon.getType() == 1) {
- Map<String, Object> couponRules = client.getCouponRules(coupon.getId());
- Double conditionalAmount = (Double) couponRules.get("conditionalAmount");
- Double deductionAmount = (Double) couponRules.get("deductionAmount");
- if (money.compareTo(BigDecimal.valueOf(conditionalAmount)) >= 0) {
- money = BigDecimal.valueOf(deductionAmount);
- }
- }
- if (coupon.getType() == 2) {
- Map<String, Object> couponRules = client.getCouponRules(coupon.getId());
- Object amount = couponRules.get("deductionAmount");
- money = BigDecimal.valueOf((Double) amount);
- }
+ Integer coupon1 = client.queryUserCouponById(request.getConponId());
+ System.err.println("优惠券id"+coupon1);
+ Coupon coupon = client.queryCouponById(coupon1);
+ System.err.println("优惠券信息"+coupon);
+// if (coupon.getType() == 1) {
+// Map<String, Object> couponRules = client.getCouponRules(coupon.getId());
+// Double conditionalAmount = (Double) couponRules.get("conditionalAmount");
+// Double deductionAmount = (Double) couponRules.get("deductionAmount");
+// if (money.compareTo(BigDecimal.valueOf(conditionalAmount)) >= 0) {
+// money = BigDecimal.valueOf(deductionAmount);
+// }
+// }
+// if (coupon.getType() == 2) {
+// Map<String, Object> couponRules = client.getCouponRules(coupon.getId());
+// System.err.println("优惠券规则"+couponRules);
+// Object amount = couponRules.get("conditionalAmount");
+// money = BigDecimal.valueOf((Double) amount);
+// }
}
try {
return WeChatPayment(code, money,request.getLessonId());
@@ -877,7 +892,8 @@
}
case 2:
if (request.getUseConpon() == 1) {
- Coupon coupon = client.queryCouponById(request.getConponId());
+ Integer coupon1 = client.queryUserCouponById(request.getConponId());
+ Coupon coupon = client.queryCouponById(coupon1);
if (coupon.getType() == 1) {
Map<String, Object> couponRules = client.getCouponRules(coupon.getId());
Double conditionalAmount = (Double) couponRules.get("conditionalAmount");
@@ -892,8 +908,10 @@
money = BigDecimal.valueOf((Double) amount);
}
}
+
return AlipayPayment(code, money);
case 3:
+ System.err.println("选择");
PlaypaiGoldPayment(appUser, code, wpGold);
break;
default:
@@ -903,102 +921,27 @@
}
public ResultUtil WeChatPayment(String code, BigDecimal request,Integer coursePackageId) throws Exception {
+ System.err.println("code-------------"+code);
+ System.err.println("request---------------"+request);
+ System.err.println("coursePackageId-------------"+coursePackageId);
TCoursePackage byId = coursePackageService.getById(coursePackageId);
+ System.err.println("课包"+coursePackageId);
Integer storeId = byId.getStoreId();
Store store = storeClient.queryStoreById(storeId);
- // 是否分账 0否1是
- int isFenZhang= 1;
- String merchantNumber = "";
+ System.err.println("门店查询"+store);
if (store.getOperatorId()==null || store.getOperatorId()==0){
- // 平台
- isFenZhang = 0;
- }
- ResultUtil weixinpay = payMoneyUtil.weixinpay("课包续费"+"-"+isFenZhang, "", code, request.toString(),
+ ResultUtil weixinpay = payMoneyUtil.weixinpay("课包续费", "", code, request.toString(),
"/base/coursePackage/wechatRegisteredCoursesCallback", "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);
- //修改课时有效期
-
- CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getOne(new QueryWrapper<CoursePackagePaymentConfig>()
- .eq("coursePackageId", coursePackageOrder1.getId())
- .eq("classHours", coursePackageOrder1.getClassHours())
- );
- coursePackageService.addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
- 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(transaction_id, request.multiply(bigDecimal1), s2,nonce_str);
- if (!fenzhang.getCode().equals(500)){
- System.err.println("分账失败 原因是:"+fenzhang.getMsg());
- }
- }
- }
- break;
- }
- if ("USERPAYING".equals(s) || "NOTPAY".equals(s)) {
- num++;
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }).start();
+ 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/coursePackage/wechatRegisteredCoursesCallback1",request.toString(),"");
}
- return weixinpay;
}
private String smid = "2088330203191220";//平台支付宝商户号
@@ -1031,79 +974,82 @@
}else 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,"课包购买", "课包购买", "", code, request.toString(),
"/base/coursePackage/alipayRegisteredCoursesCallback");
- if (alipay.getCode() == 200) {
- String finalCode = code;
- 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);
- // 判断这个课包属于哪个门店 属于哪个运营商 根据运营商 id 获取对应的商户号
- Integer coursePackageId = coursePackagePayment.getCoursePackageId();
- TCoursePackage byId = coursePackageService.getById(coursePackageId);
- Store store = storeClient.queryStoreById(byId.getStoreId());
- if (store.getOperatorId() == null ){
- // 说明是平台的门店 无需冻结资金 不走分账
- payMoneyUtil.confirm1(smid,code,tradeNo,request.toString());
- }else if (store.getOperatorId() == 0){
- // 说明是平台的门店
- payMoneyUtil.confirm1(smid,code,tradeNo,request.toString());
- // 发起分账
- extracted(store, coursePackageOrder1, tradeNo);
- }else{
- payMoneyUtil.confirm(storeClient.getSMIDByOperatorId(store.getOperatorId()),code,tradeNo,request.toString());
- // 发起分账
- extracted(store, coursePackageOrder1, tradeNo);
- }
- break;
- }
- if ("WAIT_BUYER_PAY".equals(s)) {
- num++;
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }).start();
- }
+// if (alipay.getCode() == 200) {
+// String finalCode = code;
+// 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);
+// // 判断这个课包属于哪个门店 属于哪个运营商 根据运营商 id 获取对应的商户号
+// Integer coursePackageId = coursePackagePayment.getCoursePackageId();
+// TCoursePackage byId = coursePackageService.getById(coursePackageId);
+// Store store = storeClient.queryStoreById(byId.getStoreId());
+// if (store.getOperatorId() == null ){
+// // 说明是平台的门店 无需冻结资金 不走分账
+// payMoneyUtil.confirm1(smid,code,tradeNo,request.toString());
+// }else if (store.getOperatorId() == 0){
+// // 说明是平台的门店
+// payMoneyUtil.confirm1(smid,code,tradeNo,request.toString());
+// // 发起分账
+// extracted(store, coursePackageOrder1, tradeNo);
+// }else{
+// payMoneyUtil.confirm(storeClient.getSMIDByOperatorId(store.getOperatorId()),code,tradeNo,request.toString());
+// // 发起分账
+// extracted(store, coursePackageOrder1, tradeNo);
+// }
+// break;
+// }
+// if ("WAIT_BUYER_PAY".equals(s)) {
+// num++;
+// }
+// }
+// }
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
+// }).start();
+// }
return alipay;
}
@@ -1155,17 +1101,31 @@
}
public ResultUtil PlaypaiGoldPayment(AppUser appUser, String code, Integer wpGold) {
- TCoursePackagePayment packagePayment = this.baseMapper.selectOne(new QueryWrapper<TCoursePackagePayment>()
+ System.err.println("进入玩湃支付");
+ CoursePackageOrder packagePayment = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
.eq("code", code));
+ System.err.println("支付"+packagePayment);
+ System.err.println("用户信息"+appUser);
+ System.err.println("code"+code);
+ System.err.println("wpGold"+wpGold);
if (appUser.getPlayPaiCoins() < wpGold) {
return ResultUtil.error("玩湃币不足！");
}
packagePayment.setPayStatus(2);
packagePayment.setPayUserId(appUser.getId());
packagePayment.setPlayPaiCoin(wpGold);
- this.baseMapper.updateById(packagePayment);
+ System.err.println("扣去玩湃币");
+ try {
+ System.err.println("修改");
+ boolean b = coursePackageOrderService.updateById(packagePayment);
+ }catch (Exception e){
+ System.err.println("报错"+e.getCause());
+ System.err.println("报错"+e.getMessage());
+ e.printStackTrace();
+ }
appUser.setPlayPaiCoins(ToolUtil.isNotEmpty(appUser.getPlayPaiCoins()) ? appUser.getPlayPaiCoins() - wpGold : wpGold);
+
appuClient.updateAppUser(appUser);
return ResultUtil.success();
}
@@ -1316,7 +1276,7 @@
}
@Override
- public ResultUtil insertVipPaymentCallback(String code, String orderNumber) {
+ public ResultUtil insertVipPaymentCallback(String code, String orderNumber) throws Exception {
CoursePackageOrder coursePackageOrder1 = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
.eq("code", code).eq("state", 1));
if (coursePackageOrder1.getPayStatus() == 2) {
@@ -1332,11 +1292,11 @@
.eq("classHours", coursePackageOrder1.getClassHours())
);
coursePackageService.addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
- try {
- coursePackageService.moneyOut(orderNumber,orderNumber,code);
- } catch (AlipayApiException e) {
- e.printStackTrace();
- }
+ TCoursePackage byId = coursePackageService.getById(coursePackageOrder1.getCoursePackageId());
+ Integer storeId = byId.getStoreId();
+ Store store = storeClient.queryStoreById(storeId);
+
+
return ResultUtil.success();
}
--
Gitblit v1.7.1