From 15700b74778de49ba11745ca1dfd7bbf1356ba42 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 27 九月 2024 22:44:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderService.java b/src/main/java/com/mzl/flower/service/payment/OrderService.java
index 3b76438..710cea2 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -642,7 +642,7 @@
return new BigDecimal(0);
}
- if(couponAmount.doubleValue() >= totalAmount.doubleValue()){
+ if(couponAmount.compareTo(totalAmount) >= 0){
return price;
}
if(isLastOne){//最后的商品使用优惠券剩下的面值
@@ -1426,15 +1426,15 @@
deductAmount = deductAmount.add(a.getDeductAmount());
}
+ o.setTransferTime(LocalDateTime.now());
+ o.update(SecurityUtils.getUserId());
+
transferId = "NoNeedRefund";
if (deductAmount.doubleValue() > 0) {
transferId = paymentV3Service.refundOrderSub(o, deductAmount);
}
o.setTransferId(transferId);
- o.setTransferTime(LocalDateTime.now());
- o.update(SecurityUtils.getUserId());
orderMapper.updateById(o);
-
}
public void processLevelDown(OrderReduceDTO dto) {
--
Gitblit v1.9.3