From 11ade824e0abb0c42d6346c9b808666aaff99c9a Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 26 十一月 2025 21:26:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaxiCardServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaxiCardServiceImpl.java b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaxiCardServiceImpl.java
index c787f23..64cf2de 100644
--- a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaxiCardServiceImpl.java
+++ b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaxiCardServiceImpl.java
@@ -313,6 +313,8 @@
return taxiCardWapper;
}
+ @Autowired
+ private DouGongPayUtil douGongPayUtil;
@Override
public ResultUtil payTaxiCard(Integer uid, Integer id, Integer payType, Integer type) throws Exception {
UserInfo userInfo = userInfoService.selectById(uid);
@@ -356,7 +358,7 @@
if(payType == 1){//微信支付
String app = type == 1 ? "APP" : "JSAPI";
// resultUtil = payMoneyUtil.weixinpay("购买出行卡", "", ToolUtil.getRandomString(10), taxiCard.getSellingPrice().toString(), "/base/wxPayTaxiCardPaymentSpread", app, userInfo.getAppletsOpenId());
- resultUtil = DouGongPayUtil.wxPayOrder(taxiCard.getSellingPrice().toString(), userInfo.getAppletsOpenId(), "购买出行卡", 1, String.valueOf(id), 3);
+ resultUtil = douGongPayUtil.wxPayOrder(taxiCard.getSellingPrice().toString(), userInfo.getAppletsOpenId(), "购买出行卡", 1, String.valueOf(id), 3);
paymentRecordService.saveData(4, taxiCardPayment.getUserId(), 1, taxiCardPayment.getId(), null, 1, taxiCard.getSellingPrice(), "", 1);//添加预支付数据
}
if(payType == 2){//支付宝支付
--
Gitblit v1.7.1