From df2040a2292de1e88b6c4d1f0ba7d9a62209d8cb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 28 十一月 2025 15:26:34 +0800
Subject: [PATCH] update
---
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 10 ++++++----
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaxiCardServiceImpl.java | 4 ++--
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 2 +-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index f98b4aa..352245e 100644
--- a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -2030,7 +2030,7 @@
if ("00000000".equals(refund.get("resp_code")) && "S".equals(refund.get("trans_stat"))) {
orderCrossCity.setState(10);
}else if (!"00000000".equals(refund.get("resp_code"))) {
- return ResultUtil.error("订单取消失败：" + refund.get("resp_desc").toString());
+// return ResultUtil.success("订单取消：" + refund.get("resp_desc").toString());
}
orderCrossCityMapper.updateById(orderCrossCity);
}/*else if(query.getPayType()==4){ // 云闪付
diff --git a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 5a54529..c64fda2 100644
--- a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -1203,7 +1203,7 @@
if ("00000000".equals(refund.get("resp_code")) && "S".equals(refund.get("trans_stat"))) {
orderLogistics.setState(10);
}else if (!"00000000".equals(refund.get("resp_code"))) {
- return ResultUtil.error("订单取消失败：" + refund.get("resp_desc").toString());
+// return ResultUtil.success("订单取消：" + refund.get("resp_desc").toString());
}
orderLogisticsMapper.updateById(orderLogistics);
}
@@ -1223,8 +1223,10 @@
}else */if(query.getPayType()==2){//支付宝
//Map<String, String> map = payMoneyUtil.aliRefund(query.getCode(), query.getAmount().toString());
UserCouponRecord userCouponRecord = userCouponRecordService.selectById(couponId);
- userCouponRecord.setState(1);
- userCouponRecordService.updateById(userCouponRecord);
+ if(userCouponRecord!=null){
+ userCouponRecord.setState(1);
+ userCouponRecordService.updateById(userCouponRecord);
+ }
orderLogistics.setCouponMoney(0.00);
//if(!"10000".equals(map.get("code"))){
// return ResultUtil.error(map.get("msg"));
@@ -1235,7 +1237,7 @@
if ("00000000".equals(refund.get("resp_code")) && "S".equals(refund.get("trans_stat"))) {
orderLogistics.setState(10);
}else if (!"00000000".equals(refund.get("resp_code"))) {
- return ResultUtil.error("订单取消失败：" + refund.get("resp_desc").toString());
+// return ResultUtil.success("订单取消：" + refund.get("resp_desc").toString());
}
orderLogisticsMapper.updateById(orderLogistics);
}
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 64cf2de..9167c4c 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
@@ -358,12 +358,12 @@
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(taxiCardPayment.getId()), 3);
paymentRecordService.saveData(4, taxiCardPayment.getUserId(), 1, taxiCardPayment.getId(), null, 1, taxiCard.getSellingPrice(), "", 1);//添加预支付数据
}
if(payType == 2){//支付宝支付
// resultUtil = payMoneyUtil.alipay("购买出行卡", "购买出行卡", "", ToolUtil.getRandomString(10), taxiCard.getSellingPrice().toString(), "/base/aliPayTaxiCardPaymentSpread");
- resultUtil = DouGongPayUtil.aliPayOrder(taxiCard.getSellingPrice().toString(), userInfo.getAppletsOpenId(), "购买出行卡", 1, String.valueOf(id), 3);
+ resultUtil = DouGongPayUtil.aliPayOrder(taxiCard.getSellingPrice().toString(), userInfo.getAppletsOpenId(), "购买出行卡", 1, String.valueOf(taxiCardPayment.getId()), 3);
paymentRecordService.saveData(4, taxiCardPayment.getUserId(), 1, taxiCardPayment.getId(), null, 2, taxiCard.getSellingPrice(), "", 1);//添加预支付数据
}
if(payType == 3){//余额支付
--
Gitblit v1.7.1