|
|
|
@@ -29,61 +29,61 @@ public class WxBillBaseEntity extends TenantEntity { |
|
|
|
protected Long id; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") |
|
|
|
protected Long merchantId; |
|
|
|
public Long merchantId; |
|
|
|
|
|
|
|
@Excel(name = "商户名称", width = 20, orderNum = "2") |
|
|
|
@TableField(exist = false) |
|
|
|
protected String merchantName; |
|
|
|
public String merchantName; |
|
|
|
|
|
|
|
@Excel(name = "租赁商铺类型*", orderNum = "6", width = 20, replace = {"店铺_1", "多经点位_2"}) |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") |
|
|
|
protected Integer rentShopType; |
|
|
|
public Integer rentShopType; |
|
|
|
|
|
|
|
@Excel(name = "制单时间", format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "13") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") |
|
|
|
protected Date createtime; |
|
|
|
public Date createtime; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value="创建用户编码",name="createBy") |
|
|
|
protected Long createBy; |
|
|
|
public Long createBy; |
|
|
|
|
|
|
|
@Excel(name = "制单用户", format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "14") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="创建用户名称",name="createBy") |
|
|
|
protected String createByName; |
|
|
|
public String createByName; |
|
|
|
|
|
|
|
@Excel(name = "最后修改日期", format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "15") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") |
|
|
|
protected Date updatetime; |
|
|
|
public Date updatetime; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value="创建用户编码",name="createBy") |
|
|
|
protected Long updateBy; |
|
|
|
public Long updateBy; |
|
|
|
|
|
|
|
@Excel(name = "最后修改用户", format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "16") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="创建用户名称",name="createBy") |
|
|
|
protected String updateByName; |
|
|
|
public String updateByName; |
|
|
|
|
|
|
|
@Excel(name = "实际应收总金额(元)", width = 20, orderNum = "8") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="实际应收金额(做了减免之后和need可能不一样)",name="receivePay") |
|
|
|
protected String receivePay; |
|
|
|
public String receivePay; |
|
|
|
|
|
|
|
@Excel(name = "实收账款(元)", width = 20, orderNum = "9") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") |
|
|
|
protected String pay; |
|
|
|
public String pay; |
|
|
|
|
|
|
|
@Excel(name = "周期开始时间", format = "yyyy-MM-dd", width = 20, orderNum = "4") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="开始时间",name="starttime") |
|
|
|
protected Date starttime; |
|
|
|
public Date starttime; |
|
|
|
|
|
|
|
@Excel(name = "周期结束时间", format = "yyyy-MM-dd", width = 20, orderNum = "5") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime") |
|
|
|
protected Date endtime; |
|
|
|
public Date endtime; |
|
|
|
@TableField(exist = false) |
|
|
|
protected Date endtimeBegin; |
|
|
|
public Date endtimeBegin; |
|
|
|
@TableField(exist = false) |
|
|
|
protected Date endtimeEnd; |
|
|
|
public Date endtimeEnd; |
|
|
|
|
|
|
|
@Excel(name = "欠缴金额(元)", width = 20, orderNum = "11") |
|
|
|
@TableField(exist = false) |
|
|
|
protected String owe; |
|
|
|
public String owe; |
|
|
|
|
|
|
|
public String getOwe() { |
|
|
|
if (StringUtils.isNotBlank(receivePay) && StringUtils.isNotBlank(pay)) { |
|
|
|
@@ -94,56 +94,56 @@ public class WxBillBaseEntity extends TenantEntity { |
|
|
|
|
|
|
|
@Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "坏账_7", "退租待结算_8"}, width = 20, orderNum = "10") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "账单状态EnumBillStatus", name = "status") |
|
|
|
protected Integer status; |
|
|
|
public Integer status; |
|
|
|
@TableField(exist = false) |
|
|
|
protected List<Integer> statusList; |
|
|
|
public List<Integer> statusList; |
|
|
|
|
|
|
|
//@Excel(name = "实际应收总金额(元)", width = 20, orderNum = "8") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="实际应收金额(加上了滞纳金服务费等费用)",name="realReceivePay") |
|
|
|
@TableField(exist = false) |
|
|
|
protected String realReceivePay; |
|
|
|
public String realReceivePay; |
|
|
|
|
|
|
|
@Excel(name = "账单类型名称", width = 20, orderNum = "8") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="账单类型名称",name="billTypeName") |
|
|
|
@TableField(exist = false) |
|
|
|
protected String billTypeName; |
|
|
|
public String billTypeName; |
|
|
|
@TableField(exist = false) |
|
|
|
protected Integer billType; |
|
|
|
public Integer billType; |
|
|
|
|
|
|
|
//已退款金额 |
|
|
|
@TableField(exist = false) |
|
|
|
protected String returnPay; |
|
|
|
public String returnPay; |
|
|
|
|
|
|
|
@Excel(name = "备注", width = 20, orderNum = "9") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="备注",name="billRemark") |
|
|
|
@TableField(exist = false) |
|
|
|
protected String billRemark; |
|
|
|
public String billRemark; |
|
|
|
|
|
|
|
@Excel(name = "最近催缴时间",format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "10") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="最近催缴时间",name="lastOweCallTime") |
|
|
|
protected Date lastOweCallTime; |
|
|
|
public Date lastOweCallTime; |
|
|
|
|
|
|
|
@Excel(name = "最近催缴人员", width = 20, orderNum = "11") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="最近催缴时间",name="lastOweCallUser") |
|
|
|
protected String lastOweCallUser; |
|
|
|
public String lastOweCallUser; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") |
|
|
|
@TableField(exist = false) |
|
|
|
protected Long building; |
|
|
|
public Long building; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") |
|
|
|
@TableField(exist = false) |
|
|
|
protected Long floor; |
|
|
|
public Long floor; |
|
|
|
|
|
|
|
//滞纳金 |
|
|
|
@TableField(exist = false) |
|
|
|
protected String billLatePay; |
|
|
|
public String billLatePay; |
|
|
|
//服务费 |
|
|
|
@TableField(exist = false) |
|
|
|
protected String billServicePay; |
|
|
|
public String billServicePay; |
|
|
|
|
|
|
|
@TableField(exist = false) |
|
|
|
protected String billAllNeedPay; |
|
|
|
public String billAllNeedPay; |
|
|
|
|
|
|
|
public String getBillAllNeedPay() { |
|
|
|
String bl = this.getBillLatePay(); |
|
|
|
@@ -159,25 +159,25 @@ public class WxBillBaseEntity extends TenantEntity { |
|
|
|
} |
|
|
|
|
|
|
|
@TableField(exist = false) |
|
|
|
protected List<Long> merchantIdList; |
|
|
|
public List<Long> merchantIdList; |
|
|
|
|
|
|
|
@TableField(exist = false) |
|
|
|
protected String month; |
|
|
|
public String month; |
|
|
|
|
|
|
|
//EnumBillOweOrNearType 逾期 1, 临期 2 |
|
|
|
@TableField(exist = false) |
|
|
|
protected Integer onlyOweOrNear; |
|
|
|
public Integer onlyOweOrNear; |
|
|
|
|
|
|
|
//账单逾期计算截止时间 |
|
|
|
@TableField(exist = false) |
|
|
|
private Date oweBillLastTime; |
|
|
|
public Date oweBillLastTime; |
|
|
|
|
|
|
|
//临期计算截止时间 |
|
|
|
@TableField(exist = false) |
|
|
|
private Date nearBillLastTime; |
|
|
|
public Date nearBillLastTime; |
|
|
|
|
|
|
|
//临期计算截止时间 |
|
|
|
@TableField(exist = false) |
|
|
|
private Integer notifyed; |
|
|
|
public Integer notifyed; |
|
|
|
|
|
|
|
} |