diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveBill.java index 75895886a..8914b0f98 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveBill.java @@ -1,9 +1,11 @@ package com.iformall.domain.po; +import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumBillAllType; +import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; @@ -70,6 +72,23 @@ public class WxFinanceReceiveBill extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "是否已删除", name = "isDel") private Integer isDel; + @TableField(exist = false) + private String receivePay; + public String getReceivePay() { + if (null != payWay && payWay != Constant.bill_pay_way_setoff) { + receivePay = receive; + } + return receivePay; + } + @TableField(exist = false) + private String setOff; + public String getSetOff() { + if (null != payWay && payWay == Constant.bill_pay_way_setoff) { + setOff = receive; + } + return setOff; + } + @TableField(exist = false) private String shopNumber; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintReceiveBillDataHandler.java b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintReceiveBillDataHandler.java index 07ce3f41e..dbab44c3e 100644 --- a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintReceiveBillDataHandler.java +++ b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintReceiveBillDataHandler.java @@ -48,6 +48,10 @@ public class PrintReceiveBillDataHandler implements PrintDataParser{ return receive.getReceive(); }else if (name.equals("pay")) { return receive.getPay(); + }else if (name.equals("receivePay")) { + return receive.getReceivePay(); + }else if (name.equals("setOff")) { + return receive.getSetOff(); }else if (name.equals("starttime")) { if (null != receive.getStarttime()) { return DateUtils.date2String(receive.getStarttime(),DateUtils.DATE_PATTERN);