Merge branch 'dev' into test

3aedc4f8 · 吕明尚 · a1c6a619 · 97a22e60 · 3aedc4f8
Commit 3aedc4f8 authored Oct 25, 2024 by 吕明尚
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

SOrderServiceImpl.java ...ain/java/share/system/service/impl/SOrderServiceImpl.java +2 -2

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
@@ -2663,7 +2663,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
        priceResponse.setDuration(BigDecimal.ZERO);
        priceResponse.setRemainingDuration(BigDecimal.ZERO);
        priceResponse.setAvailableDuration(BigDecimal.ZERO);
-        priceResponse.setDiscount(new BigDecimal(100));
+        priceResponse.setDiscount(BigDecimal.ZERO);
        priceResponse.setMemberDiscount(BigDecimal.ZERO);
        priceResponse.setDiscountRatio(new BigDecimal(100));
        Activity activity = null;
@@ -2897,7 +2897,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                    }

                } else {
-                    priceResponse.setDiscount(new BigDecimal(100));
+                    priceResponse.setDiscount(BigDecimal.ZERO);
                }
            }
            priceResponse.setDiscountFee(priceResponse.getTotalFee().subtract(priceResponse.getPayFee()));