|
|
@@ -259,24 +259,16 @@ public class Invoice implements Serializable {
|
|
|
@TableField(exist = false)
|
|
|
private String productName;
|
|
|
@TableField(exist = false)
|
|
|
- private BigDecimal productMoney;
|
|
|
- @TableField(exist = false)
|
|
|
private String payType;
|
|
|
@TableField(exist = false)
|
|
|
private String productMoneyStr;
|
|
|
@TableField(exist = false)
|
|
|
private String moneyStr;
|
|
|
|
|
|
- public BigDecimal getProductMoney() {
|
|
|
- if(money != null && productCount != null){
|
|
|
- return money.divide(BigDecimal.valueOf(productCount),2, RoundingMode.UP);
|
|
|
- }
|
|
|
- return productMoney;
|
|
|
- }
|
|
|
|
|
|
public String getProductMoneyStr() {
|
|
|
- if(productMoney != null){
|
|
|
- return "US$ " + productMoney;
|
|
|
+ if(money != null && productCount != null){
|
|
|
+ return "US$ " + money.divide(BigDecimal.valueOf(productCount),2, RoundingMode.UP);
|
|
|
}
|
|
|
return productMoneyStr;
|
|
|
}
|