From 0b956579c125f41f27d1e09ecae5853926ef19fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 15:48:57 +0800
Subject: [PATCH] 合并代码
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/account/OrderPaymentServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/account/OrderPaymentServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/account/OrderPaymentServiceImpl.java
index 589996f..3477bcf 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/account/OrderPaymentServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/account/OrderPaymentServiceImpl.java
@@ -58,11 +58,22 @@
}
@Override
- public void updatePaySuccess(String outTradeNo, String transactionId) {
+ public OrderPayment getByUnpaidOrderId(String orderId) {
+ LambdaQueryWrapper<OrderPayment> queryWrapper = Wrappers.lambdaQuery();
+ queryWrapper.eq(OrderPayment::getOrderId, orderId)
+ .eq(OrderPayment::getDelFlag, 0)
+ .eq(OrderPayment::getPayStatus, 1)
+ .last(" limit 1 ");
+ return this.getOne(queryWrapper);
+ }
+
+ @Override
+ public void updatePaySuccess(String outTradeNo, BigDecimal feeAmount, String transactionId) {
LambdaUpdateWrapper<OrderPayment> updateWrapper = Wrappers.lambdaUpdate();
updateWrapper.eq(OrderPayment::getOutTradeNo, outTradeNo)
.set(OrderPayment::getPayStatus, 2)
.set(OrderPayment::getTransactionId, transactionId)
+ .set(OrderPayment::getFeeAmount, feeAmount)
.set(OrderPayment::getBackTime, new Date());
this.update(updateWrapper);
}
--
Gitblit v1.7.1