Compare commits
No commits in common. "d2cdceec1cca1bffa9b45287e379c7811a95325c" and "bfff6137524de9963e46e8bb1000b1bf27a931fb" have entirely different histories.
d2cdceec1c
...
bfff613752
|
|
@ -38,7 +38,6 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.time.temporal.ChronoUnit;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
|
@ -1288,9 +1287,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
|
|||
BigDecimal waresPrice = saOrderItems.getWaresPrice();
|
||||
// 商品数量
|
||||
BigDecimal waresQuantityBig = new BigDecimal(saOrderItems.getWaresQuantity());
|
||||
// 单个商品价格
|
||||
BigDecimal waresOnePrice = waresPrice.divide(waresQuantityBig, 6, RoundingMode.FLOOR);
|
||||
|
||||
// 前一个会员等级
|
||||
int beforeGradeValue = 0;
|
||||
// 前一个会员等级的平级收益人数
|
||||
|
|
@ -1360,7 +1356,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
|
|||
continue;
|
||||
}
|
||||
// 平级收益(商品价格 * 千分之五) -- 6位小数,四舍五入
|
||||
sameBonusIncome = waresOnePrice.multiply(RetailConstants.SAME_RATIO).setScale(6, BigDecimal.ROUND_HALF_UP).multiply(waresQuantityBig);
|
||||
sameBonusIncome = waresPrice.multiply(RetailConstants.SAME_RATIO).setScale(6, BigDecimal.ROUND_HALF_UP);
|
||||
// 平级收益累计
|
||||
beforeSameBonus = beforeSameBonus.add(sameBonusIncome);
|
||||
// 平级等级代数等级
|
||||
|
|
|
|||
Loading…
Reference in New Issue