feat: 价格超过两位向下舍去
This commit is contained in:
@@ -115,7 +115,7 @@ public class TbCashierCart implements Serializable {
|
|||||||
} else {
|
} else {
|
||||||
subtract = salePrice.subtract(discountSaleAmount);
|
subtract = salePrice.subtract(discountSaleAmount);
|
||||||
}
|
}
|
||||||
totalAmount = totalNumber.multiply(subtract.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : subtract).add(packFee);
|
totalAmount = totalNumber.multiply(subtract.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : subtract).add(packFee).setScale(2, RoundingMode.DOWN);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -140,11 +140,11 @@ public class TbCashierCart implements Serializable {
|
|||||||
BigDecimal subtract;
|
BigDecimal subtract;
|
||||||
if (isMember != null && isMember == 1 && memberPrice != null && memberPrice.compareTo(BigDecimal.ZERO) > 0) {
|
if (isMember != null && isMember == 1 && memberPrice != null && memberPrice.compareTo(BigDecimal.ZERO) > 0) {
|
||||||
subtract = memberPrice.subtract(discountSaleAmount);
|
subtract = memberPrice.subtract(discountSaleAmount);
|
||||||
totalAmount = totalNumber.multiply(subtract).add(packFee).multiply(discountRadio).setScale(2, RoundingMode.HALF_UP);
|
totalAmount = totalNumber.multiply(subtract).add(packFee).multiply(discountRadio).setScale(2, RoundingMode.DOWN);
|
||||||
} else {
|
} else {
|
||||||
subtract = salePrice.subtract(discountSaleAmount);
|
subtract = salePrice.subtract(discountSaleAmount);
|
||||||
totalAmount = totalNumber.multiply(subtract)
|
totalAmount = totalNumber.multiply(subtract)
|
||||||
.add(packFee).multiply(discountRadio).setScale(2, RoundingMode.HALF_UP);
|
.add(packFee).multiply(discountRadio).setScale(2, RoundingMode.DOWN);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -165,9 +165,9 @@ public class TbCashierCart implements Serializable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (isMember != null && isMember == 1 && memberPrice != null && memberPrice.compareTo(BigDecimal.ZERO) > 0) {
|
if (isMember != null && isMember == 1 && memberPrice != null && memberPrice.compareTo(BigDecimal.ZERO) > 0) {
|
||||||
return num.multiply(memberPrice).multiply(discountRadio).add(packFee).setScale(2, RoundingMode.HALF_UP);
|
return num.multiply(memberPrice).multiply(discountRadio).add(packFee).setScale(2, RoundingMode.DOWN);
|
||||||
}else {
|
}else {
|
||||||
return num.multiply(discountSaleAmount != null ? discountSaleAmount : salePrice).add(packFee).multiply(discountRadio).setScale(2, RoundingMode.HALF_UP);
|
return num.multiply(discountSaleAmount != null ? discountSaleAmount : salePrice).add(packFee).multiply(discountRadio).setScale(2, RoundingMode.DOWN);
|
||||||
}
|
}
|
||||||
// if (isMember != null && isMember == 1 && memberPrice != null && memberPrice.compareTo(BigDecimal.ZERO) > 0) {
|
// if (isMember != null && isMember == 1 && memberPrice != null && memberPrice.compareTo(BigDecimal.ZERO) > 0) {
|
||||||
// return num.multiply(memberPrice);
|
// return num.multiply(memberPrice);
|
||||||
|
|||||||
Reference in New Issue
Block a user