|
|
|
@@ -7,6 +7,7 @@ import com.iformall.domain.po.base.TenantEntity; |
|
|
|
import com.iformall.enums.EnumFinanceCashierType; |
|
|
|
import com.iformall.enums.EnumFinanceReceiveStatus; |
|
|
|
import com.iformall.enums.EnumFinanceReceiveType; |
|
|
|
import com.iformall.utils.PriceUtilV2; |
|
|
|
|
|
|
|
import lombok.Data; |
|
|
|
import lombok.EqualsAndHashCode; |
|
|
|
@@ -48,13 +49,37 @@ public class WxFinanceReceive extends TenantEntity { |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "实收金额", name = "receiveMoney") |
|
|
|
private String receiveMoney; |
|
|
|
@TableField(exist = false) |
|
|
|
private String receiveMoneyChinese; |
|
|
|
public String getReceiveMoneyChinese() { |
|
|
|
if (StringUtils.isNotBlank(receiveMoney)) { |
|
|
|
receiveMoneyChinese = PriceUtilV2.number2CNMontrayUnit(new BigDecimal(receiveMoney)); |
|
|
|
} |
|
|
|
return receiveMoneyChinese; |
|
|
|
} |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "支付给商户金额", name = "payMoney") |
|
|
|
private String payMoney; |
|
|
|
@TableField(exist = false) |
|
|
|
private String payMoneyChinese; |
|
|
|
public String getPayMoneyChinese() { |
|
|
|
if (StringUtils.isNotBlank(payMoney)) { |
|
|
|
payMoneyChinese = PriceUtilV2.number2CNMontrayUnit(new BigDecimal(payMoney)); |
|
|
|
} |
|
|
|
return payMoneyChinese; |
|
|
|
} |
|
|
|
|
|
|
|
//跟useMoney的区别是,这个字段是记录此次收款冲抵了多少费用。useMoney是使用了自身多少的实收金额,预充用的到 |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "冲抵金额", name = "setOffMoney") |
|
|
|
private String setOffMoney; |
|
|
|
@TableField(exist = false) |
|
|
|
private String setOffMoneyChinese; |
|
|
|
public String getSetOffMoneyChinese() { |
|
|
|
if (StringUtils.isNotBlank(setOffMoney)) { |
|
|
|
setOffMoneyChinese = PriceUtilV2.number2CNMontrayUnit(new BigDecimal(setOffMoney)); |
|
|
|
} |
|
|
|
return setOffMoneyChinese; |
|
|
|
} |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "已使用金额,冲抵里面使用", name = "useMoney") |
|
|
|
private String useMoney; |
|
|
|
@@ -69,6 +94,8 @@ public class WxFinanceReceive extends TenantEntity { |
|
|
|
return new BigDecimal(receiveMoney).subtract(new BigDecimal(useMoney)).toPlainString(); |
|
|
|
} |
|
|
|
|
|
|
|
@TableField(exist = false) |
|
|
|
private String allReceiveMoney; |
|
|
|
public String getAllReceiveMoney() { |
|
|
|
if (StringUtils.isBlank(receiveMoney)) { |
|
|
|
receiveMoney = "0"; |
|
|
|
@@ -76,7 +103,14 @@ public class WxFinanceReceive extends TenantEntity { |
|
|
|
if (StringUtils.isBlank(setOffMoney)) { |
|
|
|
setOffMoney = "0"; |
|
|
|
} |
|
|
|
return new BigDecimal(receiveMoney).add(new BigDecimal(setOffMoney)).toPlainString(); |
|
|
|
allReceiveMoney = new BigDecimal(receiveMoney).add(new BigDecimal(setOffMoney)).toPlainString(); |
|
|
|
return allReceiveMoney; |
|
|
|
} |
|
|
|
@TableField(exist = false) |
|
|
|
private String allReceiveMoneyChinese; |
|
|
|
public String getAllReceiveMoneyChinese() { |
|
|
|
allReceiveMoneyChinese = PriceUtilV2.number2CNMontrayUnit(new BigDecimal(getAllReceiveMoney())); |
|
|
|
return allReceiveMoneyChinese; |
|
|
|
} |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "状态EnumFinanceReceiveStatus", name = "status") |
|
|
|
|