attiya/ebike-plus
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

字段更新为long类型

Browse Source
This commit is contained in:
yanglei 2025-11-14 20:48:08 +08:00
parent b280c02adf
commit 138078a5cf
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeWxPayServiceImpl.java
View File

@ -116,7 +116,7 @@ public class EbikeWxPayServiceImpl implements EbikeWxPayService {
if (Transaction.TradeStateEnum.NOTPAY.ordinal() == tradeStatus if (Transaction.TradeStateEnum.NOTPAY.ordinal() == tradeStatus
|| Transaction.TradeStateEnum.USERPAYING.ordinal() == tradeStatus) { || Transaction.TradeStateEnum.USERPAYING.ordinal() == tradeStatus) {
// 检查订单是否关闭 // 检查订单是否关闭
Transaction t = queryOrderByOutTradeNo(ebikePayment.getTradeId().toString()); Transaction t = queryOrderByOutTradeNo(String.valueOf(ebikePayment.getTradeId()));
if (t != null && Transaction.TradeStateEnum.CLOSED.equals(t.getTradeState())) { if (t != null && Transaction.TradeStateEnum.CLOSED.equals(t.getTradeState())) {
// 验证是否存在支付成功但状态未同步的情况 // 验证是否存在支付成功但状态未同步的情况
EbikeWxHandleNotifyVo hr = queryOrderStatusByOrderId(ebikePayment); EbikeWxHandleNotifyVo hr = queryOrderStatusByOrderId(ebikePayment);
@ -178,7 +178,7 @@ public class EbikeWxPayServiceImpl implements EbikeWxPayService {
EbikePaymentAmountVo amount = paymentVo.getAmount(); EbikePaymentAmountVo amount = paymentVo.getAmount();
EbikePaymentDetailVo detail = paymentVo.getDetail(); EbikePaymentDetailVo detail = paymentVo.getDetail();
String tradeId = ebikePayment == null ? outTradeNo : ebikePayment.getTradeId().toString(); String tradeId = ebikePayment == null ? outTradeNo : String.valueOf(ebikePayment.getTradeId());
try { try {
PrepayRequest request = new PrepayRequest(); PrepayRequest request = new PrepayRequest();
request.setAppid(wxPayConfig.getAppId()); request.setAppid(wxPayConfig.getAppId());
@ -303,7 +303,7 @@ public class EbikeWxPayServiceImpl implements EbikeWxPayService {
log.error("{}支付订单不存在!", orderId); log.error("{}支付订单不存在!", orderId);
return null; return null;
} }
return queryOrderByOutTradeNo(ebikePayment.getTradeId().toString()); return queryOrderByOutTradeNo(String.valueOf(ebikePayment.getTradeId()));
} }
@Override @Override
@ -334,7 +334,7 @@ public class EbikeWxPayServiceImpl implements EbikeWxPayService {
*/ */
private EbikeWxHandleNotifyVo queryOrderStatusByOrderId(EbikePayment ebikePayment) { private EbikeWxHandleNotifyVo queryOrderStatusByOrderId(EbikePayment ebikePayment) {
EbikeWxHandleNotifyVo result = new EbikeWxHandleNotifyVo(); EbikeWxHandleNotifyVo result = new EbikeWxHandleNotifyVo();
Transaction r = queryOrderByOutTradeNo(ebikePayment.getTradeId().toString()); Transaction r = queryOrderByOutTradeNo(String.valueOf(ebikePayment.getTradeId()));
if (r != null && Transaction.TradeStateEnum.SUCCESS.equals(r.getTradeState())) { if (r != null && Transaction.TradeStateEnum.SUCCESS.equals(r.getTradeState())) {
result.setMessage(String.format("订单%s支付成功", ebikePayment.getOrderId())); result.setMessage(String.format("订单%s支付成功", ebikePayment.getOrderId()));
result.setSuccess(true); result.setSuccess(true);
@ -414,7 +414,7 @@ public class EbikeWxPayServiceImpl implements EbikeWxPayService {
// 发起退款 // 发起退款
CreateRequest request = new CreateRequest(); CreateRequest request = new CreateRequest();
request.setTransactionId(transactionId); request.setTransactionId(transactionId);
request.setOutTradeNo(ebikePayment.getTradeId().toString()); request.setOutTradeNo(String.valueOf(ebikePayment.getTradeId()));
request.setOutRefundNo(ebikeRefund.getRefundOrderId()); request.setOutRefundNo(ebikeRefund.getRefundOrderId());
request.setReason(ebikeRefund.getReason()); request.setReason(ebikeRefund.getReason());
request.setNotifyUrl(wxPayConfig.getRefundNotifyUrl()); request.setNotifyUrl(wxPayConfig.getRefundNotifyUrl());

4
ebike-payment/src/main/java/com/cdzy/payment/task/WxPayTask.java
View File

@ -48,7 +48,7 @@ public class WxPayTask {
for (EbikePayment ebikePayment : ebikePaymentList) { for (EbikePayment ebikePayment : ebikePaymentList) {
log.warn("未支付的订单号 ===> {}", ebikePayment.getOrderId()); log.warn("未支付的订单号 ===> {}", ebikePayment.getOrderId());
// 调用微信支付查询接口，查询支付状态 // 调用微信支付查询接口，查询支付状态
Transaction transaction = wxPayService.queryOrderByOutTradeNo(ebikePayment.getTradeId().toString()); Transaction transaction = wxPayService.queryOrderByOutTradeNo(String.valueOf(ebikePayment.getTradeId()));
// 3. 更新订单状态 // 3. 更新订单状态
if (transaction != null) { if (transaction != null) {
ebikePaymentService.updatePaymentStatus(transaction); ebikePaymentService.updatePaymentStatus(transaction);
@ -67,7 +67,7 @@ public class WxPayTask {
for (EbikePayment ebikePayment : ebikePaymentList) { for (EbikePayment ebikePayment : ebikePaymentList) {
log.warn("超时未支付的订单号 ===> {}", ebikePayment.getOrderId()); log.warn("超时未支付的订单号 ===> {}", ebikePayment.getOrderId());
// 调用微信支付关闭接口，关闭订单 // 调用微信支付关闭接口，关闭订单
boolean close = wxPayService.closeOrder(ebikePayment.getTradeId().toString()); boolean close = wxPayService.closeOrder(String.valueOf(ebikePayment.getTradeId()));
if (close) { if (close) {
// 3. 更新订单状态 // 3. 更新订单状态
Transaction transaction = new Transaction(); Transaction transaction = new Transaction();