From cb5cbb5128adc1814e43780b92faab447bc70a8d Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 11:29:03 +0800
Subject: [PATCH] 代码调整
---
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java | 8 +++++---
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 3 ++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 68d79b7..f05ba4e 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -1553,7 +1553,8 @@
public void offlineTravelPaymentCallback(HttpServletRequest request, HttpServletResponse response){
try {
System.err.println("线下收款开始回调-------------------");
- ResultNotification resultNotification = PayUtil.payResultNotification(request);
+// ResultNotification resultNotification = PayUtil.payResultNotification(request);
+ ResultNotification resultNotification = new ResultNotification();
System.err.println("支付回调：" + JSON.toJSONString(resultNotification));
if(null != resultNotification){
if("000000".equals(resultNotification.getReturnCode())){
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
index fc37e7b..a1b1856 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -172,9 +172,11 @@
offlineTravelPayment.setInsertTime(new Date());
offlineTravelPaymentService.insert(offlineTravelPayment);
Driver driver = driverService.selectById(driverId);
- String codeUrl = PayUtil.polymericPay(null, null, "", pay_type, money, "打车支付"
- , callbackPath + "/base/offlineTravelPaymentCallback", randomCode
- , "https://okyueche.com:8443/h5/#/pages/index/evaluate", driver.getMchtNo());
+// String codeUrl = PayUtil.polymericPay(null, null, "", pay_type, money, "打车支付"
+// , callbackPath + "/base/offlineTravelPaymentCallback", randomCode
+// , "https://okyueche.com:8443/h5/#/pages/index/evaluate", driver.getMchtNo());
+ //支付
+ String codeUrl = "";
if(ToolUtil.isNotEmpty(codeUrl)){
Map<String, String> map = new HashMap<>();
map.put("url", codeUrl);
--
Gitblit v1.7.1