From c667e50f6e366d450ec77443746440fa8bca4723 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 01 八月 2025 17:47:15 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 748b610..494fe50 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -25,6 +25,7 @@
import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.ModifyTravelItineraryRequest;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.QYTPaymentCallback;
+import com.stylefeng.guns.modular.system.util.qianyuntong.model.QYTPaymentCallbackData;
import com.stylefeng.guns.modular.system.warpper.*;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.model.PaymentRecord;
@@ -2143,7 +2144,28 @@
@PostMapping("/base/order/qytPaymentCallback")
public String qytPaymentCallback(@RequestBody QYTPaymentCallback qytPaymentCallback) {
log.info("【黔云通支付回调通知】请求参数:" + JSON.toJSONString(qytPaymentCallback));
- if (null == qytPaymentCallback) {
+ try {
+ if (null == qytPaymentCallback) {
+ return "error";
+ }
+ QYTPaymentCallbackData data = qytPaymentCallback.getData();
+ if("1".equals(data.getStatus())){
+ return "error";
+ }
+ String partnerPayId = data.getPartnerPayId();
+ String payId = data.getPayId();
+ //网约车
+ if(partnerPayId.contains("PR")){
+ partnerPayId = partnerPayId.substring(2);
+ orderPrivateCarService.payOrderPrivateCarCallback(Integer.valueOf(partnerPayId), payId, 1);
+ }
+ //出租车
+ if(partnerPayId.contains("TA")){
+ partnerPayId = partnerPayId.substring(2);
+ orderTaxiService.payOrderTaxiCallback(Integer.valueOf(partnerPayId), payId, 1, 0);
+ }
+ }catch (Exception e){
+ e.printStackTrace();
return "error";
}
return "success";
--
Gitblit v1.7.1