Commit 97a22e60 by 吕明尚

修改订单计算价格

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