|
@@ -2440,6 +2440,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
Coupon coupon = couponDistributePopularizeMapper.selectDiscountCouponByUserId(distributeId, order.getSkuId());
|
|
Coupon coupon = couponDistributePopularizeMapper.selectDiscountCouponByUserId(distributeId, order.getSkuId());
|
|
|
//未配置对应折扣
|
|
//未配置对应折扣
|
|
|
//按优惠多少对半平摊
|
|
//按优惠多少对半平摊
|
|
|
|
|
+ BigDecimal real_points = points;
|
|
|
if (coupon == null) {
|
|
if (coupon == null) {
|
|
|
BigDecimal splitDiscount = BigDecimal.valueOf(1).subtract(plat_discount);
|
|
BigDecimal splitDiscount = BigDecimal.valueOf(1).subtract(plat_discount);
|
|
|
BigDecimal avg = realMoney.multiply(splitDiscount).divide(BigDecimal.valueOf(2));
|
|
BigDecimal avg = realMoney.multiply(splitDiscount).divide(BigDecimal.valueOf(2));
|
|
@@ -2448,6 +2449,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
points = BigDecimal.ZERO;
|
|
points = BigDecimal.ZERO;
|
|
|
}
|
|
}
|
|
|
distributeWaitingSendPoints.setIsRule(true);
|
|
distributeWaitingSendPoints.setIsRule(true);
|
|
|
|
|
+ //平摊积分
|
|
|
|
|
+ distributeWaitingSendPoints.setDeductPoints(real_points.subtract(points));
|
|
|
}
|
|
}
|
|
|
if (coupon != null) {
|
|
if (coupon != null) {
|
|
|
BigDecimal distribute_discount = coupon.getDiscount();
|
|
BigDecimal distribute_discount = coupon.getDiscount();
|
|
@@ -2462,6 +2465,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
points = BigDecimal.ZERO;
|
|
points = BigDecimal.ZERO;
|
|
|
}
|
|
}
|
|
|
distributeWaitingSendPoints.setIsRule(true);
|
|
distributeWaitingSendPoints.setIsRule(true);
|
|
|
|
|
+ //平摊积分
|
|
|
|
|
+ distributeWaitingSendPoints.setDeductPoints(real_points.subtract(points));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|