From b92c83c58222a82184b525178405dcc8ea8c21fd Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 25 七月 2024 15:17:55 +0800
Subject: [PATCH] 优化支付
---
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 102 insertions(+), 4 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 110b083..1d5349b 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
@@ -45,6 +45,7 @@
import java.math.BigDecimal;
import java.math.MathContext;
import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
import java.util.*;
@@ -649,13 +650,58 @@
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 +"",id + "_1_" + UUIDUtil.getRandomCode(3),query.getMoney()+"","/base/wxCancelOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
- //Map<String, String> map = icbcPayUtil.placeAnOrder(id + ",1", 9, 5, uid.toString(), "订单取消", query.getMoney(), callbackPath + "/base/wxCancelOrderTaxi", "", type, userInfo.getAppletsOpenId());
+ 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);//添加预支付数据
- resultUtil = resultUtil;
+ new Thread(()->{
+ int num = 1;
+ int min = 5000;
+ int w = 0;
+ while (num <= 10) {
+ try {
+ w += min * num;
+ OrderPrivateCar orderPrivateCar1 = orderPrivateCarMapper.selectById(id);
+ if (orderPrivateCar1.getState() == 10) {
+ break;
+ }
+ ResultUtil<Map<String, Object>> resultUtil1 = payMoneyUtil.queryWXOrder("", code, "JSAPI");
+ if (resultUtil1.getCode() == 200) {
+ /**
+ * SUCCESS--支付成功
+ * REFUND--转入退款
+ * NOTPAY--未支付
+ * CLOSED--已关闭
+ * REVOKED--已撤销(刷卡支付)
+ * USERPAYING--用户支付中
+ * PAYERROR--支付失败(其他原因，如银行返回失败)
+ * ACCEPT--已接收，等待扣款
+ */
+ String s = resultUtil1.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();
+ payCancelOrderPrivateCar(id, transaction_id, 1);
+ break;
+ }
+ if ("NOTPAY".equals(s) || "USERPAYING".equals(s)) {
+ Thread.sleep(w);
+ num++;
+ }
+ } else {
+ Thread.sleep(w);
+ num++;
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ }).start();
+
}else{
resultUtil = ResultUtil.error("支付失败", "");
}
@@ -934,9 +980,55 @@
return ResultUtil.error("未授权微信，无法完成支付");
}
if(payType == 1){//微信支付
- resultUtil = payMoneyUtil.weixinpay("完成订单",orderId +"",orderId + "_1_" + UUIDUtil.getRandomCode(3),orderMoney+"","/base/wxPayOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
+ String code = orderId + "_1_" + UUIDUtil.getRandomCode(3);
+ 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);//添加预支付数据
+ new Thread(()->{
+ int num = 1;
+ int min = 5000;
+ int w = 0;
+ while (num <= 10) {
+ try {
+ w += min * num;
+ OrderPrivateCar orderPrivateCar1 = orderPrivateCarMapper.selectById(orderId);
+ if (orderPrivateCar1.getState() != 7) {
+ break;
+ }
+ ResultUtil<Map<String, Object>> resultUtil1 = payMoneyUtil.queryWXOrder("", code, "JSAPI");
+ if (resultUtil1.getCode() == 200) {
+ /**
+ * SUCCESS--支付成功
+ * REFUND--转入退款
+ * NOTPAY--未支付
+ * CLOSED--已关闭
+ * REVOKED--已撤销(刷卡支付)
+ * USERPAYING--用户支付中
+ * PAYERROR--支付失败(其他原因，如银行返回失败)
+ * ACCEPT--已接收，等待扣款
+ */
+ String s = resultUtil1.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();
+ payOrderPrivateCarCallback(orderId, transaction_id, 1);
+ break;
+ }
+ if ("NOTPAY".equals(s) || "USERPAYING".equals(s)) {
+ Thread.sleep(w);
+ num++;
+ }
+ } else {
+ Thread.sleep(w);
+ num++;
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ }).start();
}else{
resultUtil = ResultUtil.error("支付失败", "");
}
@@ -1119,6 +1211,9 @@
@Override
public void payCancelOrderPrivateCar(Integer id, String order_id, Integer type) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(id);
+ if(orderPrivateCar.getState() == 10){
+ return;
+ }
PaymentRecord query = paymentRecordService.query(1, null, null, Integer.valueOf(id), 1, type, 1);
if(null != query){
//添加交易明细
@@ -1174,6 +1269,9 @@
@Override
public void payOrderPrivateCarCallback(Integer id, String order_id, Integer type) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(id);
+ if(orderPrivateCar.getState() != 7){
+ return;
+ }
PaymentRecord query = paymentRecordService.query(1, null, null, Integer.valueOf(id), 1, type, 1);
if(null != query){
//添加交易明细
--
Gitblit v1.7.1