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/crossCity/server/impl/OrderCrossCityServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index 7fe7cc2..56bb789 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -310,13 +310,14 @@
orderMoney = v;
}
}
+ String code = orderId + "_3_fei";
if(payType == 1){//微信支付
if(ToolUtil.isEmpty(userInfo.getAppletsOpenId())){
return ResultUtil.error("未授权微信，无法完成支付");
}
- resultUtil = payMoneyUtil.weixinpay("完成订单",orderId +"",orderId + "_3_fei",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, 3, 1, orderMoney, null, 1);//添加预支付数据
+ paymentRecordService.saveData(1, null, null, orderId, 3, 1, orderMoney, null, 1, code);//添加预支付数据
resultUtil = resultUtil;
}else{
resultUtil = ResultUtil.error("获取支付信息失败", "");
@@ -325,7 +326,7 @@
if(payType == 2){//支付宝支付
resultUtil = payMoneyUtil.alipay("完成订单","完成订单", "",orderId + ",3" ,orderMoney+"","/base/aliPayOrderTaxi");
if(resultUtil.getCode()==200){
- paymentRecordService.saveData(1, null, null, orderId, 3, 2, orderMoney, null, 1);//添加预支付数据
+ paymentRecordService.saveData(1, null, null, orderId, 3, 2, orderMoney, null, 1, code);//添加预支付数据
resultUtil = resultUtil;
}else{
resultUtil = ResultUtil.error("获取支付信息失败", "");
@@ -772,15 +773,16 @@
}
CancleOrder query = cancleOrderService.query(1, 3, orderCrossCity.getCompanyId());
if(null != query){
+ String code = id + "_3_fei";
if(payType == 1){//微信支付
if(ToolUtil.isEmpty(userInfo.getAppletsOpenId())){
return ResultUtil.error("未授权微信，无法完成支付");
}
orderCancel.setPayType(1);
orderCancelService.updateById(orderCancel);
- resultUtil = payMoneyUtil.weixinpay("订单取消",id +"",id + "_3_fei",query.getMoney()+"","/base/wxCancelOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
+ resultUtil = payMoneyUtil.weixinpay("订单取消",id +"", code,query.getMoney()+"","/base/wxCancelOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
if(resultUtil.getCode()==200){
- paymentRecordService.saveData(1, null, null, id, 3, 1, query.getMoney(), null, 1);//添加预支付数据
+ paymentRecordService.saveData(1, null, null, id, 3, 1, query.getMoney(), null, 1, code);//添加预支付数据
resultUtil = resultUtil;
}else{
resultUtil = ResultUtil.error("获取支付信息失败", "");
@@ -791,7 +793,7 @@
orderCancelService.updateById(orderCancel);
resultUtil = payMoneyUtil.alipay("订单取消","订单取消", "",id + ",3",query.getMoney()+"","/base/aliCancelOrderTaxi");
if(resultUtil.getCode()==200){
- paymentRecordService.saveData(1, null, null, id, 3, 2, query.getMoney(), null, 1);//添加预支付数据
+ paymentRecordService.saveData(1, null, null, id, 3, 2, query.getMoney(), null, 1, code);//添加预支付数据
resultUtil = resultUtil;
}else{
resultUtil = ResultUtil.error("获取支付信息失败", "");
--
Gitblit v1.7.1