From 00ee134d5bcb07e9a07633963e68ba7e9fa215c2 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期二, 13 八月 2024 17:48:12 +0800
Subject: [PATCH] 优化支付
---
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 61 ++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 1d5349b..ce4a33f 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -646,16 +646,16 @@
CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, orderPrivateCar.getCompanyId());
if(null != query){
+ String code = id + "_1_" + UUIDUtil.getRandomCode(3);
if(payType == 1){//微信支付
if(ToolUtil.isEmpty(userInfo.getAppletsOpenId())){
return ResultUtil.error("未授权微信，无法完成支付");
}
- String code = id + "_1_" + UUIDUtil.getRandomCode(3);
orderCancel.setPayType(1);
orderCancelService.updateById(orderCancel);
resultUtil = payMoneyUtil.weixinpay("订单取消",id +"",code,query.getMoney()+"","/base/wxCancelOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
if(resultUtil.getCode()==200){
- paymentRecordService.saveData(1, null, null, id, 1, 1, query.getMoney(), null, 1);//添加预支付数据
+ paymentRecordService.saveData(1, null, null, id, 1, 1, query.getMoney(), null, 1, code);//添加预支付数据
new Thread(()->{
int num = 1;
int min = 5000;
@@ -710,9 +710,9 @@
if(payType == 2){//支付宝支付
orderCancel.setPayType(2);
orderCancelService.updateById(orderCancel);
- resultUtil = payMoneyUtil.alipay("订单取消","订单取消", "",id + "_1_" + UUIDUtil.getRandomCode(3),query.getMoney()+"","/base/aliCancelOrderTaxi");
+ resultUtil = payMoneyUtil.alipay("订单取消","订单取消", "",code,query.getMoney()+"","/base/aliCancelOrderTaxi");
if(resultUtil.getCode()==200){
- paymentRecordService.saveData(1, null, null, id, 1, 2, query.getMoney(), null, 1);//添加预支付数据
+ paymentRecordService.saveData(1, null, null, id, 1, 2, query.getMoney(), null, 1, code);//添加预支付数据
resultUtil = resultUtil;
}else{
resultUtil = ResultUtil.error("支付失败", "");
@@ -911,6 +911,9 @@
list.addAll(list1);
return list;
}
+
+
+
@Override
public ResultUtil payPrivateCarOrder(Integer payType, Integer orderId, Integer couponId, Integer type) throws Exception {
@@ -921,6 +924,39 @@
if(orderPrivateCar.getState() != 7){
return ResultUtil.error("订单不在待支付状态，不允许支付", "");
}
+ String code = orderId + "_1_" + UUIDUtil.getRandomCode(5);
+ PaymentRecord query3 = paymentRecordService.query(1, null, null, orderId, 1, payType, null);
+ if(null != query3){
+ ResultUtil<Map<String, Object>> resultUtil1 = payMoneyUtil.queryWXOrder("", query3.getSerialNumber(), "JSAPI");
+ if (resultUtil1.getCode() == 200) {
+ /**
+ * SUCCESS--支付成功
+ * REFUND--转入退款
+ * NOTPAY--未支付
+ * CLOSED--已关闭
+ * REVOKED--已撤销(刷卡支付)
+ * USERPAYING--用户支付中
+ * PAYERROR--支付失败(其他原因，如银行返回失败)
+ * ACCEPT--已接收，等待扣款
+ */
+ String result_code = resultUtil1.getData().get("result_code").toString();
+ if("SUCCESS".equals(result_code)){
+ String s = resultUtil1.getData().get("trade_state").toString();
+ if ("REFUND".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s)) {
+ payMoneyUtil.closeWXOrder(query3.getSerialNumber());
+ }
+ if ("SUCCESS".equals(s) || "ACCEPT".equals(s)) {
+ return ResultUtil.error("不允许重复支付");
+ }
+ if ("NOTPAY".equals(s) || "USERPAYING".equals(s)) {
+ payMoneyUtil.closeWXOrder(query3.getSerialNumber());
+ }
+ }
+ }
+ }
+
+
+
Integer uid = orderPrivateCar.getUserId();
Double orderMoney = orderPrivateCar.getOrderMoney();
UserInfo userInfo = userInfoService.selectById(uid);
@@ -980,10 +1016,9 @@
return ResultUtil.error("未授权微信，无法完成支付");
}
if(payType == 1){//微信支付
- String code = orderId + "_1_" + UUIDUtil.getRandomCode(3);
- resultUtil = payMoneyUtil.weixinpay("完成订单",orderId +"",code,orderMoney+"","/base/wxPayOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
+ resultUtil = payMoneyUtil.weixinpay("完成订单",orderId +"", code,orderMoney+"","/base/wxPayOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
if(resultUtil.getCode()==200){
- paymentRecordService.saveData(1, null, null, orderId, 1, 1, orderMoney, null, 1);//添加预支付数据
+ paymentRecordService.saveData(1, null, null, orderId, 1, 1, orderMoney, null, 1, code);//添加预支付数据
new Thread(()->{
int num = 1;
int min = 5000;
@@ -995,8 +1030,8 @@
if (orderPrivateCar1.getState() != 7) {
break;
}
- ResultUtil<Map<String, Object>> resultUtil1 = payMoneyUtil.queryWXOrder("", code, "JSAPI");
- if (resultUtil1.getCode() == 200) {
+ ResultUtil<Map<String, Object>> resultUtil2 = payMoneyUtil.queryWXOrder("", code, "JSAPI");
+ if (resultUtil2.getCode() == 200) {
/**
* SUCCESS--支付成功
* REFUND--转入退款
@@ -1007,12 +1042,12 @@
* PAYERROR--支付失败(其他原因，如银行返回失败)
* ACCEPT--已接收，等待扣款
*/
- String s = resultUtil1.getData().get("trade_state").toString();
+ String s = resultUtil2.getData().get("trade_state").toString();
if ("REFUND".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
break;
}
if ("SUCCESS".equals(s) || "ACCEPT".equals(s)) {
- String transaction_id = resultUtil1.getData().get("transaction_id").toString();
+ String transaction_id = resultUtil2.getData().get("transaction_id").toString();
payOrderPrivateCarCallback(orderId, transaction_id, 1);
break;
}
@@ -1035,9 +1070,9 @@
}
if(payType == 2) {//支付宝支付
- resultUtil = payMoneyUtil.alipay("完成订单","完成订单", "",orderId + "_1_" + UUIDUtil.getRandomCode(3),orderMoney+"","/base/aliPayOrderTaxi");
+ resultUtil = payMoneyUtil.alipay("完成订单","完成订单", "",code,orderMoney+"","/base/aliPayOrderTaxi");
if (resultUtil.getCode()==200) {
- paymentRecordService.saveData(1, null, null, orderId, 1, 2, orderMoney, null, 1);//添加预支付数据
+ paymentRecordService.saveData(1, null, null, orderId, 1, 2, orderMoney, null, 1, code);//添加预支付数据
} else {
resultUtil = ResultUtil.error("支付失败", "");
}
--
Gitblit v1.7.1