From afa7e63a25bb3776608f9bfa489d95fbd253b481 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Fri, 4 Jul 2025 14:59:31 +0800 Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E8=B0=83=E6=95=B4=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=90=8D=E7=A7=B0&=E5=9B=9E=E8=B0=83=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E9=AA=8C=E8=AF=81&=E5=8D=95=E5=8F=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hzs/third/pay/jdpay/sdk/JdPayConstant.java | 3 ++- .../com/hzs/third/pay/service/impl/JdPayServiceImpl.java | 2 +- .../java/com/hzs/third/pay/service/impl/PayServiceImpl.java | 5 ++++- .../com/hzs/third/pay/service/impl/RefundServiceImpl.java | 4 ++-- .../third/pay/service/impl/TOnlinePaymentServiceImpl.java | 5 ++++- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/bd-third/src/main/java/com/hzs/third/pay/jdpay/sdk/JdPayConstant.java b/bd-third/src/main/java/com/hzs/third/pay/jdpay/sdk/JdPayConstant.java index 4d2e5cc1..420673c7 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/jdpay/sdk/JdPayConstant.java +++ b/bd-third/src/main/java/com/hzs/third/pay/jdpay/sdk/JdPayConstant.java @@ -11,7 +11,8 @@ public class JdPayConstant { /** * 三方聚合统一收单 url **/ - public static final String AGGREGATE_CREATE_ORDER_URL = "/api/createAggregateOrder"; +// public static final String AGGREGATE_CREATE_ORDER_URL = "/api/createAggregateOrder"; + public static final String AGGREGATE_CREATE_ORDER_URL = "/api/createIndustryOrder"; /** * 交易查询 url **/ diff --git a/bd-third/src/main/java/com/hzs/third/pay/service/impl/JdPayServiceImpl.java b/bd-third/src/main/java/com/hzs/third/pay/service/impl/JdPayServiceImpl.java index 8faa8585..7f6ed569 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/service/impl/JdPayServiceImpl.java +++ b/bd-third/src/main/java/com/hzs/third/pay/service/impl/JdPayServiceImpl.java @@ -300,7 +300,7 @@ public class JdPayServiceImpl implements IJdPayService { .tradeAmount(onlinePayment.getPayMoney()) .outTradeNo(request.getOutTradeNo()) .build(); - if ("0000".equals(response.getResultCode())) { + if ("00000".equals(response.getResultCode())) { // 请求响应成功 // 京东唯一订单号 onlinePayment.setPayNumber(response.getTradeNo()); diff --git a/bd-third/src/main/java/com/hzs/third/pay/service/impl/PayServiceImpl.java b/bd-third/src/main/java/com/hzs/third/pay/service/impl/PayServiceImpl.java index e594b3f8..15e5c541 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/service/impl/PayServiceImpl.java +++ b/bd-third/src/main/java/com/hzs/third/pay/service/impl/PayServiceImpl.java @@ -1,5 +1,6 @@ package com.hzs.third.pay.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hzs.activity.base.IActivityServiceApi; import com.hzs.common.core.constant.CacheConstants; @@ -66,7 +67,9 @@ public class PayServiceImpl implements IPayService { try { // 校验支付信息状态、业务与支付金额是否一致等 - TOnlinePayment onlinePayment = itOnlinePaymentService.queryByBusiness(Integer.valueOf(businessType), businessCode, null); + TOnlinePayment onlinePayment = itOnlinePaymentService.queryByBusiness( + ObjectUtil.isNotEmpty(businessType) ? Integer.valueOf(businessType) : null + , businessCode, null); if (null == onlinePayment || EPayStatus.PAID.getValue() == onlinePayment.getPayStatus()) { log.error("支付信息不存在或已支付"); return false; diff --git a/bd-third/src/main/java/com/hzs/third/pay/service/impl/RefundServiceImpl.java b/bd-third/src/main/java/com/hzs/third/pay/service/impl/RefundServiceImpl.java index 909de373..6f1d3791 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/service/impl/RefundServiceImpl.java +++ b/bd-third/src/main/java/com/hzs/third/pay/service/impl/RefundServiceImpl.java @@ -384,7 +384,7 @@ public class RefundServiceImpl implements IRefundService { // 请求京东退款接口 JdPayRefundResponse response = jdPay.refund(request); - if ("0000".equals(response.getResultCode())) { + if ("00000".equals(response.getResultCode())) { // 请求响应成功 // 申请退款成功，保存退款 TOnlineRefund tOnlineRefund = new TOnlineRefund(); @@ -465,7 +465,7 @@ public class RefundServiceImpl implements IRefundService { itOnlineRefundService.save(tOnlineRefund); return "提交退款成功"; } else { - log.info("提交退款失败"); + log.error("提交退款失败! {}", JSONUtil.toJsonStr(response)); return "提交退款失败!["+response.getResultDesc()+"]"; } } catch (Exception e) { diff --git a/bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentServiceImpl.java b/bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentServiceImpl.java index bd4050d1..b2c9491a 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentServiceImpl.java +++ b/bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentServiceImpl.java @@ -1,5 +1,6 @@ package com.hzs.third.pay.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.domain.third.pay.TOnlinePayment; @@ -33,7 +34,9 @@ public class TOnlinePaymentServiceImpl extends ServiceImpl