## 商品盒数中间表支持小数盒数;
This commit is contained in:
parent
158f26ec9d
commit
ea99ec0bb5
|
@ -1127,7 +1127,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
|
||||||
// 商品最终价格
|
// 商品最终价格
|
||||||
BigDecimal waresPrice = saOrderItems.getWaresPrice();
|
BigDecimal waresPrice = saOrderItems.getWaresPrice();
|
||||||
// 商品数量
|
// 商品数量
|
||||||
BigDecimal waresQuantityBig = new BigDecimal(saOrderItems.getWaresQuantity());
|
BigDecimal waresQuantityBig = saOrderItems.getWaresQuantity();
|
||||||
// 单个商品价格
|
// 单个商品价格
|
||||||
BigDecimal waresOnePrice = waresPrice.divide(waresQuantityBig, 6, RoundingMode.FLOOR);
|
BigDecimal waresOnePrice = waresPrice.divide(waresQuantityBig, 6, RoundingMode.FLOOR);
|
||||||
|
|
||||||
|
@ -1448,7 +1448,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
|
||||||
// 商品最终价格
|
// 商品最终价格
|
||||||
BigDecimal waresPrice = saOrderWaresExt.getWaresPrice();
|
BigDecimal waresPrice = saOrderWaresExt.getWaresPrice();
|
||||||
// 商品数量
|
// 商品数量
|
||||||
BigDecimal waresQuantityBig = new BigDecimal(saOrderWaresExt.getWaresQuantity());
|
BigDecimal waresQuantityBig = saOrderWaresExt.getWaresQuantity();
|
||||||
// 单个商品价格
|
// 单个商品价格
|
||||||
BigDecimal waresOnePrice = waresPrice.divide(waresQuantityBig, 6, RoundingMode.FLOOR);
|
BigDecimal waresOnePrice = waresPrice.divide(waresQuantityBig, 6, RoundingMode.FLOOR);
|
||||||
|
|
||||||
|
@ -1460,7 +1460,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
|
||||||
if (EDelFlag.UN_DELETE.getValue() == saOrderWaresExt.getDelFlag()) {
|
if (EDelFlag.UN_DELETE.getValue() == saOrderWaresExt.getDelFlag()) {
|
||||||
if (ERatioType.VALUE.getValue() == saOrderWaresExt.getAreaIncomeType()) {
|
if (ERatioType.VALUE.getValue() == saOrderWaresExt.getAreaIncomeType()) {
|
||||||
// 按比值处理
|
// 按比值处理
|
||||||
benefitIncome = benefitIncome.add(saOrderWaresExt.getAreaIncome().multiply(new BigDecimal(saOrderWaresExt.getWaresQuantity())));
|
benefitIncome = benefitIncome.add(saOrderWaresExt.getAreaIncome().multiply(saOrderWaresExt.getWaresQuantity()));
|
||||||
} else {
|
} else {
|
||||||
// 按比率处理
|
// 按比率处理
|
||||||
benefitIncome = benefitIncome.add(saOrderWaresExt.getWaresPrice().multiply(saOrderWaresExt.getAreaIncome()).divide(new BigDecimal("100"), 6, BigDecimal.ROUND_HALF_UP));
|
benefitIncome = benefitIncome.add(saOrderWaresExt.getWaresPrice().multiply(saOrderWaresExt.getAreaIncome()).divide(new BigDecimal("100"), 6, BigDecimal.ROUND_HALF_UP));
|
||||||
|
|
Loading…
Reference in New Issue