Merge branch 'dev' into test

a46d1762 · 吕明尚 · 56eade07 · be948abd · a46d1762
Commit a46d1762 authored Oct 11, 2024 by 吕明尚
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletions

SOrderServiceImpl.java ...ain/java/share/system/service/impl/SOrderServiceImpl.java +3 -1

No files found.
--- a/share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java
+++ b/share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java
@@ -2844,7 +2844,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                            totalFee = priceResponse.getPayFee().subtract(consumerWallet.getBalance());
                        }
                        priceResponse.setPayFee(totalFee);
-                        priceResponse.setTotalFeeNow(totalFee);
+                        if (totalFee.compareTo(BigDecimal.ZERO) > 0) {
+                            priceResponse.setTotalFeeNow(totalFee);
+                        }
                        if (priceResponse.getPayFee().compareTo(BigDecimal.ZERO) > 0) {
                            BigDecimal payFee = priceResponse.getPayFee();
                            BigDecimal divide = priceResponse.getPayFee().multiply(memberConfig.getDiscountRatio()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);