Skip to content

G
gxpt_ht
Commit a1c6a619 by 吕明尚
Options

Merge branch 'dev' into test

parents ef4799de 428c0ea1
Showing with 3 additions and 3 deletions
share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java
...@@ -2663,9 +2663,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -2663,9 +2663,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
priceResponse.setDuration(BigDecimal.ZERO); priceResponse.setDuration(BigDecimal.ZERO);
priceResponse.setRemainingDuration(BigDecimal.ZERO); priceResponse.setRemainingDuration(BigDecimal.ZERO);
priceResponse.setAvailableDuration(BigDecimal.ZERO); priceResponse.setAvailableDuration(BigDecimal.ZERO);
priceResponse.setDiscount(BigDecimal.ZERO); priceResponse.setDiscount(new BigDecimal(100));
priceResponse.setMemberDiscount(BigDecimal.ZERO); priceResponse.setMemberDiscount(BigDecimal.ZERO);
priceResponse.setDiscountRatio(BigDecimal.ZERO); priceResponse.setDiscountRatio(new BigDecimal(100));
Activity activity = null; Activity activity = null;
ConsumerMember consumerMember = null; ConsumerMember consumerMember = null;
ConsumerWallet consumerWallet = null; ConsumerWallet consumerWallet = null;
...@@ -2897,7 +2897,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -2897,7 +2897,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
} }
} else { } else {
priceResponse.setDiscount(BigDecimal.ZERO); priceResponse.setDiscount(new BigDecimal(100));
} }
} }
priceResponse.setDiscountFee(priceResponse.getTotalFee().subtract(priceResponse.getPayFee())); priceResponse.setDiscountFee(priceResponse.getTotalFee().subtract(priceResponse.getPayFee()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment