From 0867ea81d6b97e5f7d71dc0318e3fd84b64bdb54 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 15 四月 2026 22:33:31 +0800
Subject: [PATCH] 支付对接

---
 UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java
index 279f8ad..8f13eb0 100644
--- a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java
+++ b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java
@@ -1,5 +1,6 @@
 package com.stylefeng.guns.modular.CharteredCar.server.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.modular.CharteredCar.dao.OrderCharteredCarMapper;
@@ -16,6 +17,7 @@
 import com.stylefeng.guns.modular.system.model.SensitiveWords;
 import com.stylefeng.guns.modular.system.model.UserInfo;
 import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.CbyzxOrderPayHelper;
 import com.stylefeng.guns.modular.system.util.DateUtil;
 import com.stylefeng.guns.modular.system.util.PayMoneyUtil;
 import com.stylefeng.guns.modular.system.util.ResultUtil;
@@ -75,6 +77,9 @@
 
     @Autowired
     private PayMoneyUtil payMoneyUtil;
+
+    @Autowired
+    private CbyzxOrderPayHelper cbyzxOrderPayHelper;
 
     @Autowired
     private IPaymentRecordService paymentRecordService;
@@ -219,9 +224,14 @@
         OrderCharteredCar orderCharteredCar = this.selectById(orderId);
         ResultUtil resultUtil = ResultUtil.success();
         if(payType == 1){//微信支付
-            String app = type == 1 ? "APP" : "JSAPI";
-            resultUtil = payMoneyUtil.weixinpay("感谢费", "", orderId + "_6_" + UUIDUtil.getRandomCode(5), money.toString(), "/base/wxPayThankYouFee", app, userInfo.getAppletsOpenId());
-            paymentRecordService.saveData(3, uid, 1, orderId, 6, 1, money, "", 1);//添加预支付数据
+            String outTradeNo = "THANK_" + orderId + "_6_" + UUIDUtil.getRandomCode(5);
+            JSONObject response = cbyzxOrderPayHelper.createOrder(orderCharteredCar.getUserId(), userInfo.getAppletsOpenId(), outTradeNo, money);
+            if (!cbyzxOrderPayHelper.isCreateSuccess(response)) {
+                return ResultUtil.error(cbyzxOrderPayHelper.extractMessage(response), response);
+            }
+            String paymentCode = cbyzxOrderPayHelper.extractRecordCode(response);
+            paymentRecordService.saveData(3, uid, 1, orderId, 6, 1, money, paymentCode != null ? paymentCode : outTradeNo, 1);//添加预支付数据
+            resultUtil = ResultUtil.success(response);
         }
         if(payType == 2){//支付宝支付
             resultUtil = payMoneyUtil.alipay("感谢费", "感谢费", "", orderId + "_6_" + UUIDUtil.getRandomCode(5), money.toString(), "/base/aliPayThankYouFee");

--
Gitblit v1.7.1