diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 0802e2518..bee4fce00 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -145,6 +145,19 @@ public class WxBillRent extends BaseEntity { @Transient @SortColumn(column = "allPeriod") private Integer allPeriod; + @Transient + @SortColumn(column = "shopNumber") + private String shopNumber; + @Transient + private Integer depositStatus; + + public Integer getDepositStatus() { + return depositStatus; + } + + public void setDepositStatus(Integer depositStatus) { + this.depositStatus = depositStatus; + } public Integer getAllPeriod() { return allPeriod; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index ac1f6f3e5..31fc32ada 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -216,7 +216,7 @@ public class WxCoupon extends BaseEntity { @Transient private Integer pressCount; @Transient - private Integer changeRate; + private String changeRate; @Transient @SortColumn(column = "join_count") private Integer pressJoinCount; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index 9e1011c29..7c9e97df9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -189,7 +189,16 @@ public class WxPropertyContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "租赁单价", name = "rentPrice") private Integer rentPrice; + @io.swagger.annotations.ApiModelProperty(value = "租金单位1日2月3年", name = "priceUnit") + private Integer priceUnit; + public Integer getPriceUnit() { + return priceUnit; + } + + public void setPriceUnit(Integer priceUnit) { + this.priceUnit = priceUnit; + } public Integer getTotalPeriodMonth() { return totalPeriodMonth; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 0ba95f695..0ec12b6d2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -339,6 +339,17 @@ public class WxRentContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "租赁单价", name = "rentPrice") private Integer rentPrice; + @io.swagger.annotations.ApiModelProperty(value = "租金单位1日2月3年", name = "priceUnit") + private Integer priceUnit; + + public Integer getPriceUnit() { + return priceUnit; + } + + public void setPriceUnit(Integer priceUnit) { + this.priceUnit = priceUnit; + } + public Integer getTotalPeriodMonth() { return totalPeriodMonth; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index 8e71159a1..9d8ee5209 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -95,6 +95,9 @@ public class WxBillAll extends BaseEntity { @Transient @SortColumn(column = "totalReceivePay") private Integer totalReceivePay; + @Transient + @SortColumn(column = "shopNumber") + private String shopNumber; @io.swagger.annotations.ApiModelProperty(value = "过滤已收金额1过滤", name = "filterHasPay") diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 61d092c0b..31cdf27b0 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -114,6 +114,7 @@ and br.`rent_contract_id` = #{rentContractId} and br.`pay_way` = #{payWay} and br.`late_pay_status` = #{latePayStatus} + and d.`status` = #{depositStatus} order by ${sortColumns} diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 412f5b4eb..9dd4e0dc5 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -41,7 +41,7 @@ - + @@ -51,7 +51,7 @@ `shop_type`,`shop_id`,`updatetime`,`createtime`,`rent_area`, `link_person`,`link_phone`,`pay_account`,`filename`,`lease`,`rent_contract_id`, `start_date`,`end_date`,`apply_status`,`adjust_period`,`business_type`,adjust_ratio,`rent_info`, `file_names`, - total_period_month,total_period_day,rent_price + total_period_month,total_period_day,rent_price,price_unit diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 288821afd..2712dc1aa 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -47,6 +47,7 @@ + @@ -57,7 +58,7 @@ `pay_account`,`filename`,`lease`,`type`,`revenue`,`adjust_ratio`,`adjust_period`,`pay_ratio`, `start_date`,`end_date`, `apply_status`,`bank_name`,`rent_shop_type`,`fix_start_date`,`fix_end_date`, - `business_type`,`rent_info`, `file_names`,total_period_month,total_period_day,rent_price + `business_type`,`rent_info`, `file_names`,total_period_month,total_period_day,rent_price,price_unit