| @@ -71,24 +71,24 @@ public class WxBillAction implements Serializable { | |||||
| private Date updatetime; | private Date updatetime; | ||||
| @Transient | @Transient | ||||
| private Integer oldPrice; | |||||
| private Long oldPrice; | |||||
| @Transient | @Transient | ||||
| private Integer newPrice; | |||||
| private Long newPrice; | |||||
| public Integer getOldPrice() { | |||||
| public Long getOldPrice() { | |||||
| return oldPrice; | return oldPrice; | ||||
| } | } | ||||
| public void setOldPrice(Integer oldPrice) { | |||||
| public void setOldPrice(Long oldPrice) { | |||||
| this.oldPrice = oldPrice; | this.oldPrice = oldPrice; | ||||
| } | } | ||||
| public Integer getNewPrice() { | |||||
| public Long getNewPrice() { | |||||
| return newPrice; | return newPrice; | ||||
| } | } | ||||
| public void setNewPrice(Integer newPrice) { | |||||
| public void setNewPrice(Long newPrice) { | |||||
| this.newPrice = newPrice; | this.newPrice = newPrice; | ||||
| } | } | ||||
| @@ -64,10 +64,10 @@ public class WxBillDaily implements Serializable { | |||||
| /*实际应收金额**/ | /*实际应收金额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | ||||
| private Integer receivePay; | |||||
| private Long receivePay; | |||||
| /*实收金额**/ | /*实收金额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | ||||
| private Integer pay; | |||||
| private Long pay; | |||||
| /*截止收款日期**/ | /*截止收款日期**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") | @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") | ||||
| private Date receiveDate; | private Date receiveDate; | ||||
| @@ -85,7 +85,7 @@ public class WxBillDaily implements Serializable { | |||||
| private String tenantId; | private String tenantId; | ||||
| /*欠缴**/ | /*欠缴**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | ||||
| private Integer owe; | |||||
| private Long owe; | |||||
| /*账单状态1待缴2欠缴3已结清**/ | /*账单状态1待缴2欠缴3已结清**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status") | @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status") | ||||
| private Integer status; | private Integer status; | ||||
| @@ -130,16 +130,19 @@ public class WxBillDaily implements Serializable { | |||||
| this.payWay = payWay; | this.payWay = payWay; | ||||
| } | } | ||||
| public Integer getReceivePay() { | |||||
| public Long getReceivePay() { | |||||
| return receivePay; | return receivePay; | ||||
| } | } | ||||
| public void setReceivePay(Integer _receivePay) { | |||||
| public void setReceivePay(Long _receivePay) { | |||||
| receivePay = _receivePay; | receivePay = _receivePay; | ||||
| } | } | ||||
| public Integer getPay() { | |||||
| public Long getPay() { | |||||
| return pay; | return pay; | ||||
| } | } | ||||
| public void setPay(Integer _pay) { | |||||
| public void setPay(Long _pay) { | |||||
| pay = _pay; | pay = _pay; | ||||
| } | } | ||||
| public Date getReceiveDate() { | public Date getReceiveDate() { | ||||
| @@ -172,10 +175,12 @@ public class WxBillDaily implements Serializable { | |||||
| public void setTenantId(String _tenantId) { | public void setTenantId(String _tenantId) { | ||||
| tenantId = _tenantId; | tenantId = _tenantId; | ||||
| } | } | ||||
| public Integer getOwe() { | |||||
| public Long getOwe() { | |||||
| return owe; | return owe; | ||||
| } | } | ||||
| public void setOwe(Integer _owe) { | |||||
| public void setOwe(Long _owe) { | |||||
| owe = _owe; | owe = _owe; | ||||
| } | } | ||||
| public Integer getStatus() { | public Integer getStatus() { | ||||
| @@ -48,10 +48,10 @@ public class WxBillDeposit implements Serializable { | |||||
| private Long rentContractId; | private Long rentContractId; | ||||
| /*实际应收金额**/ | /*实际应收金额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | ||||
| private Integer receivePay; | |||||
| private Long receivePay; | |||||
| /*实收金额**/ | /*实收金额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | ||||
| private Integer pay; | |||||
| private Long pay; | |||||
| /*收款日期**/ | /*收款日期**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | ||||
| private Date receiveDate; | private Date receiveDate; | ||||
| @@ -69,7 +69,7 @@ public class WxBillDeposit implements Serializable { | |||||
| private String tenantId; | private String tenantId; | ||||
| /*欠缴**/ | /*欠缴**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | ||||
| private Integer owe; | |||||
| private Long owe; | |||||
| /*账单状态1未到期2待缴3欠缴4已结清**/ | /*账单状态1未到期2待缴3欠缴4已结清**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status") | @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status") | ||||
| private Integer status; | private Integer status; | ||||
| @@ -78,7 +78,7 @@ public class WxBillDeposit implements Serializable { | |||||
| private Integer isDel; | private Integer isDel; | ||||
| /*应收金额**/ | /*应收金额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") | @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") | ||||
| private Integer needPay; | |||||
| private Long needPay; | |||||
| /*商户ID**/ | /*商户ID**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| @@ -149,16 +149,20 @@ public class WxBillDeposit implements Serializable { | |||||
| public void setRentContractId(Long _rentContractId) { | public void setRentContractId(Long _rentContractId) { | ||||
| rentContractId = _rentContractId; | rentContractId = _rentContractId; | ||||
| } | } | ||||
| public Integer getReceivePay() { | |||||
| public Long getReceivePay() { | |||||
| return receivePay; | return receivePay; | ||||
| } | } | ||||
| public void setReceivePay(Integer _receivePay) { | |||||
| public void setReceivePay(Long _receivePay) { | |||||
| receivePay = _receivePay; | receivePay = _receivePay; | ||||
| } | } | ||||
| public Integer getPay() { | |||||
| public Long getPay() { | |||||
| return pay; | return pay; | ||||
| } | } | ||||
| public void setPay(Integer _pay) { | |||||
| public void setPay(Long _pay) { | |||||
| pay = _pay; | pay = _pay; | ||||
| } | } | ||||
| public Date getReceiveDate() { | public Date getReceiveDate() { | ||||
| @@ -191,10 +195,12 @@ public class WxBillDeposit implements Serializable { | |||||
| public void setTenantId(String _tenantId) { | public void setTenantId(String _tenantId) { | ||||
| tenantId = _tenantId; | tenantId = _tenantId; | ||||
| } | } | ||||
| public Integer getOwe() { | |||||
| public Long getOwe() { | |||||
| return owe; | return owe; | ||||
| } | } | ||||
| public void setOwe(Integer _owe) { | |||||
| public void setOwe(Long _owe) { | |||||
| owe = _owe; | owe = _owe; | ||||
| } | } | ||||
| public Integer getStatus() { | public Integer getStatus() { | ||||
| @@ -209,10 +215,12 @@ public class WxBillDeposit implements Serializable { | |||||
| public void setIsDel(Integer _isDel) { | public void setIsDel(Integer _isDel) { | ||||
| isDel = _isDel; | isDel = _isDel; | ||||
| } | } | ||||
| public Integer getNeedPay() { | |||||
| public Long getNeedPay() { | |||||
| return needPay; | return needPay; | ||||
| } | } | ||||
| public void setNeedPay(Integer _needPay) { | |||||
| public void setNeedPay(Long _needPay) { | |||||
| needPay = _needPay; | needPay = _needPay; | ||||
| } | } | ||||
| public Long getMerchantId() { | public Long getMerchantId() { | ||||
| @@ -75,10 +75,10 @@ public class WxBillOther implements Serializable { | |||||
| /*实际应收金额**/ | /*实际应收金额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | ||||
| private Integer receivePay; | |||||
| private Long receivePay; | |||||
| /*实收金额**/ | /*实收金额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | ||||
| private Integer pay; | |||||
| private Long pay; | |||||
| /*截止收款日期**/ | /*截止收款日期**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") | @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") | ||||
| private Date receiveDate; | private Date receiveDate; | ||||
| @@ -96,7 +96,7 @@ public class WxBillOther implements Serializable { | |||||
| private String tenantId; | private String tenantId; | ||||
| /*欠缴**/ | /*欠缴**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | ||||
| private Integer owe; | |||||
| private Long owe; | |||||
| /*账单状态1待缴2欠缴3已结清**/ | /*账单状态1待缴2欠缴3已结清**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status") | @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status") | ||||
| private Integer status; | private Integer status; | ||||
| @@ -130,16 +130,19 @@ public class WxBillOther implements Serializable { | |||||
| this.payWay = payWay; | this.payWay = payWay; | ||||
| } | } | ||||
| public Integer getReceivePay() { | |||||
| public Long getReceivePay() { | |||||
| return receivePay; | return receivePay; | ||||
| } | } | ||||
| public void setReceivePay(Integer _receivePay) { | |||||
| public void setReceivePay(Long _receivePay) { | |||||
| receivePay = _receivePay; | receivePay = _receivePay; | ||||
| } | } | ||||
| public Integer getPay() { | |||||
| public Long getPay() { | |||||
| return pay; | return pay; | ||||
| } | } | ||||
| public void setPay(Integer _pay) { | |||||
| public void setPay(Long _pay) { | |||||
| pay = _pay; | pay = _pay; | ||||
| } | } | ||||
| public Date getReceiveDate() { | public Date getReceiveDate() { | ||||
| @@ -172,10 +175,12 @@ public class WxBillOther implements Serializable { | |||||
| public void setTenantId(String _tenantId) { | public void setTenantId(String _tenantId) { | ||||
| tenantId = _tenantId; | tenantId = _tenantId; | ||||
| } | } | ||||
| public Integer getOwe() { | |||||
| public Long getOwe() { | |||||
| return owe; | return owe; | ||||
| } | } | ||||
| public void setOwe(Integer _owe) { | |||||
| public void setOwe(Long _owe) { | |||||
| owe = _owe; | owe = _owe; | ||||
| } | } | ||||
| public Integer getStatus() { | public Integer getStatus() { | ||||
| @@ -78,10 +78,10 @@ public class WxBillOtherDeposit implements Serializable { | |||||
| /*实际应收金额**/ | /*实际应收金额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value = "实际应收金额", name = "receivePay") | @io.swagger.annotations.ApiModelProperty(value = "实际应收金额", name = "receivePay") | ||||
| private Integer receivePay; | |||||
| private Long receivePay; | |||||
| /*实收金额**/ | /*实收金额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value = "实收金额", name = "pay") | @io.swagger.annotations.ApiModelProperty(value = "实收金额", name = "pay") | ||||
| private Integer pay; | |||||
| private Long pay; | |||||
| /*截止收款日期**/ | /*截止收款日期**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value = "截止收款日期", name = "receiveDate") | @io.swagger.annotations.ApiModelProperty(value = "截止收款日期", name = "receiveDate") | ||||
| private Date receiveDate; | private Date receiveDate; | ||||
| @@ -99,7 +99,7 @@ public class WxBillOtherDeposit implements Serializable { | |||||
| private String tenantId; | private String tenantId; | ||||
| /*欠缴**/ | /*欠缴**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value = "欠缴", name = "owe") | @io.swagger.annotations.ApiModelProperty(value = "欠缴", name = "owe") | ||||
| private Integer owe; | |||||
| private Long owe; | |||||
| /*账单状态1待缴2欠缴3已结清**/ | /*账单状态1待缴2欠缴3已结清**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status") | @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status") | ||||
| private Integer status; | private Integer status; | ||||
| @@ -123,7 +123,7 @@ public class WxBillOtherDeposit implements Serializable { | |||||
| private Integer rentShopType; | private Integer rentShopType; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "退还金额", name = "returnPrice") | @io.swagger.annotations.ApiModelProperty(value = "退还金额", name = "returnPrice") | ||||
| private Integer returnPrice; | |||||
| private Long returnPrice; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") | @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") | ||||
| private Integer payWay; | private Integer payWay; | ||||
| @@ -136,19 +136,19 @@ public class WxBillOtherDeposit implements Serializable { | |||||
| this.payWay = payWay; | this.payWay = payWay; | ||||
| } | } | ||||
| public Integer getReceivePay() { | |||||
| public Long getReceivePay() { | |||||
| return receivePay; | return receivePay; | ||||
| } | } | ||||
| public void setReceivePay(Integer _receivePay) { | |||||
| public void setReceivePay(Long _receivePay) { | |||||
| receivePay = _receivePay; | receivePay = _receivePay; | ||||
| } | } | ||||
| public Integer getPay() { | |||||
| public Long getPay() { | |||||
| return pay; | return pay; | ||||
| } | } | ||||
| public void setPay(Integer _pay) { | |||||
| public void setPay(Long _pay) { | |||||
| pay = _pay; | pay = _pay; | ||||
| } | } | ||||
| @@ -192,11 +192,11 @@ public class WxBillOtherDeposit implements Serializable { | |||||
| tenantId = _tenantId; | tenantId = _tenantId; | ||||
| } | } | ||||
| public Integer getOwe() { | |||||
| public Long getOwe() { | |||||
| return owe; | return owe; | ||||
| } | } | ||||
| public void setOwe(Integer _owe) { | |||||
| public void setOwe(Long _owe) { | |||||
| owe = _owe; | owe = _owe; | ||||
| } | } | ||||
| @@ -256,11 +256,11 @@ public class WxBillOtherDeposit implements Serializable { | |||||
| this.rentShopType = rentShopType; | this.rentShopType = rentShopType; | ||||
| } | } | ||||
| public Integer getReturnPrice() { | |||||
| public Long getReturnPrice() { | |||||
| return returnPrice; | return returnPrice; | ||||
| } | } | ||||
| public void setReturnPrice(Integer returnPrice) { | |||||
| public void setReturnPrice(Long returnPrice) { | |||||
| this.returnPrice = returnPrice; | this.returnPrice = returnPrice; | ||||
| } | } | ||||
| @@ -48,10 +48,10 @@ public class WxBillProperty implements Serializable { | |||||
| private Long propertyContractId; | private Long propertyContractId; | ||||
| /*实际应收金额**/ | /*实际应收金额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | ||||
| private Integer receivePay; | |||||
| private Long receivePay; | |||||
| /*实收金额**/ | /*实收金额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | ||||
| private Integer pay; | |||||
| private Long pay; | |||||
| /*收款日期**/ | /*收款日期**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | ||||
| private Date receiveDate; | private Date receiveDate; | ||||
| @@ -69,7 +69,7 @@ public class WxBillProperty implements Serializable { | |||||
| private String tenantId; | private String tenantId; | ||||
| /*欠缴**/ | /*欠缴**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | ||||
| private Integer owe; | |||||
| private Long owe; | |||||
| /*账单状态1未到期2待缴3欠缴4已结清**/ | /*账单状态1未到期2待缴3欠缴4已结清**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status") | @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status") | ||||
| private Integer status; | private Integer status; | ||||
| @@ -78,7 +78,7 @@ public class WxBillProperty implements Serializable { | |||||
| private Integer isDel; | private Integer isDel; | ||||
| /*应收金额**/ | /*应收金额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") | @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") | ||||
| private Integer needPay; | |||||
| private Long needPay; | |||||
| /*商户ID**/ | /*商户ID**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| @@ -102,7 +102,7 @@ public class WxBillProperty implements Serializable { | |||||
| private Integer rentShopType; | private Integer rentShopType; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "营业额", name = "revenue") | @io.swagger.annotations.ApiModelProperty(value = "营业额", name = "revenue") | ||||
| private Integer revenue; | |||||
| private Long revenue; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "滞纳金费率", name = "latePayRatio") | @io.swagger.annotations.ApiModelProperty(value = "滞纳金费率", name = "latePayRatio") | ||||
| private Integer latePayRatio; | private Integer latePayRatio; | ||||
| @@ -111,7 +111,7 @@ public class WxBillProperty implements Serializable { | |||||
| private Date latePayTime; | private Date latePayTime; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "滞纳金总额", name = "latePayPrice") | @io.swagger.annotations.ApiModelProperty(value = "滞纳金总额", name = "latePayPrice") | ||||
| private Integer latePayPrice; | |||||
| private Long latePayPrice; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "账期", name = "period") | @io.swagger.annotations.ApiModelProperty(value = "账期", name = "period") | ||||
| private Integer period; | private Integer period; | ||||
| @@ -196,16 +196,19 @@ public class WxBillProperty implements Serializable { | |||||
| this.propertyContractId = propertyContractId; | this.propertyContractId = propertyContractId; | ||||
| } | } | ||||
| public Integer getReceivePay() { | |||||
| public Long getReceivePay() { | |||||
| return receivePay; | return receivePay; | ||||
| } | } | ||||
| public void setReceivePay(Integer _receivePay) { | |||||
| public void setReceivePay(Long _receivePay) { | |||||
| receivePay = _receivePay; | receivePay = _receivePay; | ||||
| } | } | ||||
| public Integer getPay() { | |||||
| public Long getPay() { | |||||
| return pay; | return pay; | ||||
| } | } | ||||
| public void setPay(Integer _pay) { | |||||
| public void setPay(Long _pay) { | |||||
| pay = _pay; | pay = _pay; | ||||
| } | } | ||||
| public Date getReceiveDate() { | public Date getReceiveDate() { | ||||
| @@ -238,10 +241,12 @@ public class WxBillProperty implements Serializable { | |||||
| public void setTenantId(String _tenantId) { | public void setTenantId(String _tenantId) { | ||||
| tenantId = _tenantId; | tenantId = _tenantId; | ||||
| } | } | ||||
| public Integer getOwe() { | |||||
| public Long getOwe() { | |||||
| return owe; | return owe; | ||||
| } | } | ||||
| public void setOwe(Integer _owe) { | |||||
| public void setOwe(Long _owe) { | |||||
| owe = _owe; | owe = _owe; | ||||
| } | } | ||||
| public Integer getStatus() { | public Integer getStatus() { | ||||
| @@ -256,10 +261,12 @@ public class WxBillProperty implements Serializable { | |||||
| public void setIsDel(Integer _isDel) { | public void setIsDel(Integer _isDel) { | ||||
| isDel = _isDel; | isDel = _isDel; | ||||
| } | } | ||||
| public Integer getNeedPay() { | |||||
| public Long getNeedPay() { | |||||
| return needPay; | return needPay; | ||||
| } | } | ||||
| public void setNeedPay(Integer _needPay) { | |||||
| public void setNeedPay(Long _needPay) { | |||||
| needPay = _needPay; | needPay = _needPay; | ||||
| } | } | ||||
| public Long getMerchantId() { | public Long getMerchantId() { | ||||
| @@ -303,11 +310,11 @@ public class WxBillProperty implements Serializable { | |||||
| this.rentShopType = rentShopType; | this.rentShopType = rentShopType; | ||||
| } | } | ||||
| public Integer getRevenue() { | |||||
| public Long getRevenue() { | |||||
| return revenue; | return revenue; | ||||
| } | } | ||||
| public void setRevenue(Integer revenue) { | |||||
| public void setRevenue(Long revenue) { | |||||
| this.revenue = revenue; | this.revenue = revenue; | ||||
| } | } | ||||
| @@ -327,11 +334,11 @@ public class WxBillProperty implements Serializable { | |||||
| this.latePayTime = latePayTime; | this.latePayTime = latePayTime; | ||||
| } | } | ||||
| public Integer getLatePayPrice() { | |||||
| public Long getLatePayPrice() { | |||||
| return latePayPrice; | return latePayPrice; | ||||
| } | } | ||||
| public void setLatePayPrice(Integer latePayPrice) { | |||||
| public void setLatePayPrice(Long latePayPrice) { | |||||
| this.latePayPrice = latePayPrice; | this.latePayPrice = latePayPrice; | ||||
| } | } | ||||
| @@ -48,10 +48,10 @@ public class WxBillPropertyDeposit implements Serializable { | |||||
| private Long propertyContractId; | private Long propertyContractId; | ||||
| /*实际应收金额**/ | /*实际应收金额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | ||||
| private Integer receivePay; | |||||
| private Long receivePay; | |||||
| /*实收金额**/ | /*实收金额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | ||||
| private Integer pay; | |||||
| private Long pay; | |||||
| /*收款日期**/ | /*收款日期**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | ||||
| private Date receiveDate; | private Date receiveDate; | ||||
| @@ -69,7 +69,7 @@ public class WxBillPropertyDeposit implements Serializable { | |||||
| private String tenantId; | private String tenantId; | ||||
| /*欠缴**/ | /*欠缴**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | ||||
| private Integer owe; | |||||
| private Long owe; | |||||
| /*账单状态1未到期2待缴3欠缴4已结清**/ | /*账单状态1未到期2待缴3欠缴4已结清**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status") | @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status") | ||||
| private Integer status; | private Integer status; | ||||
| @@ -78,7 +78,7 @@ public class WxBillPropertyDeposit implements Serializable { | |||||
| private Integer isDel; | private Integer isDel; | ||||
| /*应收金额**/ | /*应收金额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") | @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") | ||||
| private Integer needPay; | |||||
| private Long needPay; | |||||
| /*商户ID**/ | /*商户ID**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| @@ -102,7 +102,7 @@ public class WxBillPropertyDeposit implements Serializable { | |||||
| private Integer rentShopType; | private Integer rentShopType; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "退还金额", name = "returnPrice") | @io.swagger.annotations.ApiModelProperty(value = "退还金额", name = "returnPrice") | ||||
| private Integer returnPrice; | |||||
| private Long returnPrice; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "商铺信息", name = "shopInfo") | @io.swagger.annotations.ApiModelProperty(value = "商铺信息", name = "shopInfo") | ||||
| private String shopInfo; | private String shopInfo; | ||||
| @@ -150,16 +150,19 @@ public class WxBillPropertyDeposit implements Serializable { | |||||
| this.propertyContractId = propertyContractId; | this.propertyContractId = propertyContractId; | ||||
| } | } | ||||
| public Integer getReceivePay() { | |||||
| public Long getReceivePay() { | |||||
| return receivePay; | return receivePay; | ||||
| } | } | ||||
| public void setReceivePay(Integer _receivePay) { | |||||
| public void setReceivePay(Long _receivePay) { | |||||
| receivePay = _receivePay; | receivePay = _receivePay; | ||||
| } | } | ||||
| public Integer getPay() { | |||||
| public Long getPay() { | |||||
| return pay; | return pay; | ||||
| } | } | ||||
| public void setPay(Integer _pay) { | |||||
| public void setPay(Long _pay) { | |||||
| pay = _pay; | pay = _pay; | ||||
| } | } | ||||
| public Date getReceiveDate() { | public Date getReceiveDate() { | ||||
| @@ -192,10 +195,12 @@ public class WxBillPropertyDeposit implements Serializable { | |||||
| public void setTenantId(String _tenantId) { | public void setTenantId(String _tenantId) { | ||||
| tenantId = _tenantId; | tenantId = _tenantId; | ||||
| } | } | ||||
| public Integer getOwe() { | |||||
| public Long getOwe() { | |||||
| return owe; | return owe; | ||||
| } | } | ||||
| public void setOwe(Integer _owe) { | |||||
| public void setOwe(Long _owe) { | |||||
| owe = _owe; | owe = _owe; | ||||
| } | } | ||||
| public Integer getStatus() { | public Integer getStatus() { | ||||
| @@ -210,10 +215,12 @@ public class WxBillPropertyDeposit implements Serializable { | |||||
| public void setIsDel(Integer _isDel) { | public void setIsDel(Integer _isDel) { | ||||
| isDel = _isDel; | isDel = _isDel; | ||||
| } | } | ||||
| public Integer getNeedPay() { | |||||
| public Long getNeedPay() { | |||||
| return needPay; | return needPay; | ||||
| } | } | ||||
| public void setNeedPay(Integer _needPay) { | |||||
| public void setNeedPay(Long _needPay) { | |||||
| needPay = _needPay; | needPay = _needPay; | ||||
| } | } | ||||
| public Long getMerchantId() { | public Long getMerchantId() { | ||||
| @@ -257,11 +264,11 @@ public class WxBillPropertyDeposit implements Serializable { | |||||
| this.rentShopType = rentShopType; | this.rentShopType = rentShopType; | ||||
| } | } | ||||
| public Integer getReturnPrice() { | |||||
| public Long getReturnPrice() { | |||||
| return returnPrice; | return returnPrice; | ||||
| } | } | ||||
| public void setReturnPrice(Integer returnPrice) { | |||||
| public void setReturnPrice(Long returnPrice) { | |||||
| this.returnPrice = returnPrice; | this.returnPrice = returnPrice; | ||||
| } | } | ||||
| @@ -48,10 +48,10 @@ public class WxBillRent implements Serializable { | |||||
| private Long rentContractId; | private Long rentContractId; | ||||
| /*实际应收金额**/ | /*实际应收金额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | ||||
| private Integer receivePay; | |||||
| private Long receivePay; | |||||
| /*实收金额**/ | /*实收金额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | ||||
| private Integer pay; | |||||
| private Long pay; | |||||
| /*收款日期**/ | /*收款日期**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | ||||
| private Date receiveDate; | private Date receiveDate; | ||||
| @@ -69,7 +69,7 @@ public class WxBillRent implements Serializable { | |||||
| private String tenantId; | private String tenantId; | ||||
| /*欠缴**/ | /*欠缴**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | ||||
| private Integer owe; | |||||
| private Long owe; | |||||
| /*账单状态1未到期2待缴3逾期未缴4部分逾期5已结清**/ | /*账单状态1未到期2待缴3逾期未缴4部分逾期5已结清**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status") | @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status") | ||||
| private Integer status; | private Integer status; | ||||
| @@ -78,7 +78,7 @@ public class WxBillRent implements Serializable { | |||||
| private Integer isDel; | private Integer isDel; | ||||
| /*应收金额**/ | /*应收金额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") | @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") | ||||
| private Integer needPay; | |||||
| private Long needPay; | |||||
| /*商户ID**/ | /*商户ID**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| @@ -104,7 +104,7 @@ public class WxBillRent implements Serializable { | |||||
| private Integer rentShopType; | private Integer rentShopType; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "营业额", name = "revenue") | @io.swagger.annotations.ApiModelProperty(value = "营业额", name = "revenue") | ||||
| private Integer revenue; | |||||
| private Long revenue; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "滞纳金费率", name = "latePayRatio") | @io.swagger.annotations.ApiModelProperty(value = "滞纳金费率", name = "latePayRatio") | ||||
| private Integer latePayRatio; | private Integer latePayRatio; | ||||
| @@ -113,7 +113,7 @@ public class WxBillRent implements Serializable { | |||||
| private Date latePayTime; | private Date latePayTime; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "滞纳金总额", name = "latePayPrice") | @io.swagger.annotations.ApiModelProperty(value = "滞纳金总额", name = "latePayPrice") | ||||
| private Integer latePayPrice; | |||||
| private Long latePayPrice; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "账期", name = "period") | @io.swagger.annotations.ApiModelProperty(value = "账期", name = "period") | ||||
| private Integer period; | private Integer period; | ||||
| @@ -204,16 +204,20 @@ public class WxBillRent implements Serializable { | |||||
| public void setRentContractId(Long _rentContractId) { | public void setRentContractId(Long _rentContractId) { | ||||
| rentContractId = _rentContractId; | rentContractId = _rentContractId; | ||||
| } | } | ||||
| public Integer getReceivePay() { | |||||
| public Long getReceivePay() { | |||||
| return receivePay; | return receivePay; | ||||
| } | } | ||||
| public void setReceivePay(Integer _receivePay) { | |||||
| public void setReceivePay(Long _receivePay) { | |||||
| receivePay = _receivePay; | receivePay = _receivePay; | ||||
| } | } | ||||
| public Integer getPay() { | |||||
| public Long getPay() { | |||||
| return pay; | return pay; | ||||
| } | } | ||||
| public void setPay(Integer _pay) { | |||||
| public void setPay(Long _pay) { | |||||
| pay = _pay; | pay = _pay; | ||||
| } | } | ||||
| public Date getReceiveDate() { | public Date getReceiveDate() { | ||||
| @@ -246,10 +250,12 @@ public class WxBillRent implements Serializable { | |||||
| public void setTenantId(String _tenantId) { | public void setTenantId(String _tenantId) { | ||||
| tenantId = _tenantId; | tenantId = _tenantId; | ||||
| } | } | ||||
| public Integer getOwe() { | |||||
| public Long getOwe() { | |||||
| return owe; | return owe; | ||||
| } | } | ||||
| public void setOwe(Integer _owe) { | |||||
| public void setOwe(Long _owe) { | |||||
| owe = _owe; | owe = _owe; | ||||
| } | } | ||||
| public Integer getStatus() { | public Integer getStatus() { | ||||
| @@ -264,10 +270,12 @@ public class WxBillRent implements Serializable { | |||||
| public void setIsDel(Integer _isDel) { | public void setIsDel(Integer _isDel) { | ||||
| isDel = _isDel; | isDel = _isDel; | ||||
| } | } | ||||
| public Integer getNeedPay() { | |||||
| public Long getNeedPay() { | |||||
| return needPay; | return needPay; | ||||
| } | } | ||||
| public void setNeedPay(Integer _needPay) { | |||||
| public void setNeedPay(Long _needPay) { | |||||
| needPay = _needPay; | needPay = _needPay; | ||||
| } | } | ||||
| public Long getMerchantId() { | public Long getMerchantId() { | ||||
| @@ -305,11 +313,11 @@ public class WxBillRent implements Serializable { | |||||
| this.rentShopType = rentShopType; | this.rentShopType = rentShopType; | ||||
| } | } | ||||
| public Integer getRevenue() { | |||||
| public Long getRevenue() { | |||||
| return revenue; | return revenue; | ||||
| } | } | ||||
| public void setRevenue(Integer revenue) { | |||||
| public void setRevenue(Long revenue) { | |||||
| this.revenue = revenue; | this.revenue = revenue; | ||||
| } | } | ||||
| @@ -329,11 +337,11 @@ public class WxBillRent implements Serializable { | |||||
| this.latePayTime = latePayTime; | this.latePayTime = latePayTime; | ||||
| } | } | ||||
| public Integer getLatePayPrice() { | |||||
| public Long getLatePayPrice() { | |||||
| return latePayPrice; | return latePayPrice; | ||||
| } | } | ||||
| public void setLatePayPrice(Integer latePayPrice) { | |||||
| public void setLatePayPrice(Long latePayPrice) { | |||||
| this.latePayPrice = latePayPrice; | this.latePayPrice = latePayPrice; | ||||
| } | } | ||||
| @@ -73,7 +73,7 @@ public class WxPropertyContract implements Serializable { | |||||
| private Long merchantId; | private Long merchantId; | ||||
| /*月租金/分成(分)**/ | /*月租金/分成(分)**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="物业费(分)",name="price") | @io.swagger.annotations.ApiModelProperty(value="物业费(分)",name="price") | ||||
| private Integer price; | |||||
| private Long price; | |||||
| /*计租开始时间**/ | /*计租开始时间**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="计租开始时间",name="rentalStartDate") | @io.swagger.annotations.ApiModelProperty(value="计租开始时间",name="rentalStartDate") | ||||
| private Date rentalStartDate; | private Date rentalStartDate; | ||||
| @@ -100,7 +100,7 @@ public class WxPropertyContract implements Serializable { | |||||
| private String contractNumber; | private String contractNumber; | ||||
| /*押金**/ | /*押金**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="押金",name="deposit") | @io.swagger.annotations.ApiModelProperty(value="押金",name="deposit") | ||||
| private Integer deposit; | |||||
| private Long deposit; | |||||
| /*交租日 计租开始时间减去交租日的天数为基数 提前多少日交租**/ | /*交租日 计租开始时间减去交租日的天数为基数 提前多少日交租**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="交租日 计租开始时间减去交租日的天数为基数 提前多少日交租",name="payDate") | @io.swagger.annotations.ApiModelProperty(value="交租日 计租开始时间减去交租日的天数为基数 提前多少日交租",name="payDate") | ||||
| private Integer payDate; | private Integer payDate; | ||||
| @@ -244,10 +244,12 @@ public class WxPropertyContract implements Serializable { | |||||
| public void setMerchantId(Long _merchantId) { | public void setMerchantId(Long _merchantId) { | ||||
| merchantId = _merchantId; | merchantId = _merchantId; | ||||
| } | } | ||||
| public Integer getPrice() { | |||||
| public Long getPrice() { | |||||
| return price; | return price; | ||||
| } | } | ||||
| public void setPrice(Integer _price) { | |||||
| public void setPrice(Long _price) { | |||||
| price = _price; | price = _price; | ||||
| } | } | ||||
| public Date getRentalStartDate() { | public Date getRentalStartDate() { | ||||
| @@ -298,10 +300,12 @@ public class WxPropertyContract implements Serializable { | |||||
| public void setContractNumber(String _contractNumber) { | public void setContractNumber(String _contractNumber) { | ||||
| contractNumber = _contractNumber; | contractNumber = _contractNumber; | ||||
| } | } | ||||
| public Integer getDeposit() { | |||||
| public Long getDeposit() { | |||||
| return deposit; | return deposit; | ||||
| } | } | ||||
| public void setDeposit(Integer _deposit) { | |||||
| public void setDeposit(Long _deposit) { | |||||
| deposit = _deposit; | deposit = _deposit; | ||||
| } | } | ||||
| public Integer getPayDate() { | public Integer getPayDate() { | ||||
| @@ -48,10 +48,10 @@ public class WxBillAllVo { | |||||
| private Integer status; | private Integer status; | ||||
| private Integer billTypeValue; | private Integer billTypeValue; | ||||
| private Integer needPay; | |||||
| private Integer receivePay; | |||||
| private Integer pay; | |||||
| private Integer owe; | |||||
| private Long needPay; | |||||
| private Long receivePay; | |||||
| private Long pay; | |||||
| private Long owe; | |||||
| private Date payDate; | private Date payDate; | ||||
| private Date starttime; | private Date starttime; | ||||
| private Date endtime; | private Date endtime; | ||||
| @@ -109,35 +109,35 @@ public class WxBillAllVo { | |||||
| this.billType = billType; | this.billType = billType; | ||||
| } | } | ||||
| public Integer getNeedPay() { | |||||
| public Long getNeedPay() { | |||||
| return needPay; | return needPay; | ||||
| } | } | ||||
| public void setNeedPay(Integer needPay) { | |||||
| public void setNeedPay(Long needPay) { | |||||
| this.needPay = needPay; | this.needPay = needPay; | ||||
| } | } | ||||
| public Integer getReceivePay() { | |||||
| public Long getReceivePay() { | |||||
| return receivePay; | return receivePay; | ||||
| } | } | ||||
| public void setReceivePay(Integer receivePay) { | |||||
| public void setReceivePay(Long receivePay) { | |||||
| this.receivePay = receivePay; | this.receivePay = receivePay; | ||||
| } | } | ||||
| public Integer getPay() { | |||||
| public Long getPay() { | |||||
| return pay; | return pay; | ||||
| } | } | ||||
| public void setPay(Integer pay) { | |||||
| public void setPay(Long pay) { | |||||
| this.pay = pay; | this.pay = pay; | ||||
| } | } | ||||
| public Integer getOwe() { | |||||
| public Long getOwe() { | |||||
| return owe; | return owe; | ||||
| } | } | ||||
| public void setOwe(Integer owe) { | |||||
| public void setOwe(Long owe) { | |||||
| this.owe = owe; | this.owe = owe; | ||||
| } | } | ||||