diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java index 0b1ff4a1c..637da1989 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java @@ -76,11 +76,13 @@ public class WxMerchantSubsidy extends BaseEntity { @Excel(name="商户应收(元)",width = 20,orderNum = "5") private String receiverPaymentStr; + @Excel(name="补贴(元)",width = 20,orderNum = "6") + @io.swagger.annotations.ApiModelProperty(value="补贴额(包含通道费)",name="subsidyStr") + private String subsidyStr; + /** 实收金额(不包含通道费)*/ @io.swagger.annotations.ApiModelProperty(value=" 实收金额(不包含通道费)",name="realPayment") private Integer realPayment; - /**补贴额(包含通道费)*/ - @Excel(name="补贴(元)",width = 20,orderNum = "6") @io.swagger.annotations.ApiModelProperty(value="补贴额(包含通道费)",name="subsidy") private Integer subsidy; /**线上补贴额/实收补贴额(通道费扣除)*/ @@ -136,7 +138,18 @@ public class WxMerchantSubsidy extends BaseEntity { this.receiverPaymentStr = receiverPaymentStr; } - public static enum Field + public String getSubsidyStr() { + if(getSubsidy()!=null) { + subsidyStr = new BigDecimal(getSubsidy()).divide(new BigDecimal(100)).toString(); + } + return subsidyStr; + } + + public void setSubsidyStr(String subsidyStr) { + this.subsidyStr = subsidyStr; + } + + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC")