From a5b5278a2532810f404530483d30a91400e33d3f Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 26 Feb 2021 11:39:10 +0800 Subject: [PATCH] rent --- .../migration/V202102260001__wx_rent_contract.sql | 3 +++ .../java/com/iformall/domain/po/WxRentContract.java | 6 ++++++ .../main/resources/mapper/WxRentContractMapper.xml | 13 ++++++++++--- 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V202102260001__wx_rent_contract.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V202102260001__wx_rent_contract.sql b/mallinkAdmin/src/main/resources/db/migration/V202102260001__wx_rent_contract.sql new file mode 100644 index 000000000..9a00cd262 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V202102260001__wx_rent_contract.sql @@ -0,0 +1,3 @@ +ALTER TABLE `wx_rent_contract` +ADD COLUMN `deposit_info` json COMMENT '押金明细' AFTER `deposit`, +ADD COLUMN `other_rent_price_info` json COMMENT '其他租金单价' AFTER `rent_price`; \ No newline at end of file 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 a44fda727..6d2a5960f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -114,6 +114,9 @@ public class WxRentContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "押金", name = "deposit") private Long deposit; + @io.swagger.annotations.ApiModelProperty(value = "押金详细", name = "depositInfo") + private String depositInfo; + @io.swagger.annotations.ApiModelProperty(value = "交租日 计租开始时间减去交租日的天数为基数 提前多少日交租", name = "payDate") @SortColumn(column = "payDate") private Integer payDate; @@ -224,6 +227,9 @@ public class WxRentContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "多径租赁单价(其他放rentInfo)", name = "priceUnit") private String rentPrice; + @io.swagger.annotations.ApiModelProperty(value = "其他多径租赁单价", name = "otherRentPriceInfo") + private String otherRentPriceInfo; + @io.swagger.annotations.ApiModelProperty(value = "主体名称", name = "subjectName") private String subjectName; diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 5ba324d17..9f3c22202 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -15,6 +15,9 @@ + + + @@ -46,8 +49,12 @@ + + + - + + @@ -82,12 +89,12 @@ `id`,`merchant_id`,`price`,`rental_start_date`,`rental_end_date`,`sign_date`,`receive_period`, - `tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`deposit`,`pay_date`,`is_del`,`merchant_name`, + `tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`deposit`,deposit_info,`pay_date`,`is_del`,`merchant_name`, `brand`,`business_id`,`shop_type`,`updatetime`,`createtime`,`link_person`,`link_phone`, `pay_account`,`filename`,`lease`,`type`,`revenue`,`adjust_ratio`,`adjust_period`,`pay_ratio`, `start_date`,`end_date`,`shop_name`,`from_id`, `apply_status`,`bank_name`,`rent_shop_type`,`fix_start_date`,`fix_end_date`, - `business_type`,`rent_info`, `file_names`,price_unit,rent_price,`subject_name`,rent_start_type, + `business_type`,`rent_info`, `file_names`,price_unit,rent_price,other_rent_price_info,`subject_name`,rent_start_type, `rent_input_way`,`adjust_ratio_way`,`operation_type`,late_pay_ratio,late_pay_day,bus_discount_ratio,bus_discount_time