|
|
@@ -517,7 +517,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
Coupon coupon = couponMapper.getCouponById(couponId);
|
|
|
BigDecimal couponMoney = null;
|
|
|
if (coupon.getType() == Coupon.Type.discount) {
|
|
|
- BigDecimal discountMoney = payRequest.getDonMoney().multiply(coupon.getDiscount()).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN);
|
|
|
+ BigDecimal discountMoney = payRequest.getDonMoney().multiply(coupon.getDiscount());
|
|
|
orderDon.setMoney(discountMoney);
|
|
|
couponMoney = payRequest.getDonMoney().subtract(discountMoney);
|
|
|
} else if (coupon.getType() == Coupon.Type.reduce) {
|
|
|
@@ -1073,7 +1073,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
couponUser.setUserId(userId);
|
|
|
couponUser.setStatus(CouponUser.Status.used);
|
|
|
couponUser.setChannel(CouponUser.Channel.exCode);
|
|
|
- couponFontService.updateCouponUserValidTime(couponId, couponUser);
|
|
|
+ couponFontService.updateCouponUserValidTime(couponUser.getCouponId(), couponUser);
|
|
|
try {
|
|
|
couponUserMapper.insert(couponUser);
|
|
|
} catch (DuplicateKeyException e) {
|
zoujiajian