diff --git a/mallinkAdmin/src/main/resources/db/migration/V202101070001__ADD_UNIQUE_INDEX_wx_user_channel.sql b/mallinkAdmin/src/main/resources/db/migration/V202101070001__ADD_UNIQUE_INDEX_wx_user_channel.sql index 600ed0184..bd803d1a7 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202101070001__ADD_UNIQUE_INDEX_wx_user_channel.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202101070001__ADD_UNIQUE_INDEX_wx_user_channel.sql @@ -1,3 +1,7 @@ ALTER TABLE `wx_user_channel` DROP INDEX `scene_address_index`, -ADD UNIQUE INDEX `scene_address_index`(`scene_address`) USING BTREE; \ No newline at end of file +ADD UNIQUE INDEX `scene_address_index`(`scene_address`) USING BTREE; + + +ALTER TABLE wx_property_contract ADD COLUMN `fixed_price` INT(1) NOT NULL DEFAULT 0 COMMENT '是否固定价格(0:按面积计算/1:固定价格)' ; +UPDATE wx_property_contract SET fixed_price = 0; \ No newline at end of file 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 1583d0b29..76f501808 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -65,6 +65,9 @@ public class WxPropertyContract extends TenantEntity { @TableField(exist = false) private List statuss; + @io.swagger.annotations.ApiModelProperty(value="是否固定价格",name="0:按面积计算,1:固定价格") + private Integer fixedPrice; + @io.swagger.annotations.ApiModelProperty(value="合同编号",name="contractNumber") private String contractNumber; diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 6c93cfe1d..cc683acf7 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -43,6 +43,7 @@ + @@ -55,7 +56,7 @@ `deposit`,`pay_date`,`is_del`,`merchant_name`,`brand`,`business_id`, `shop_type`,`updatetime`,`createtime`,`rent_area`,`rent_shop_type`, `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`, + `start_date`,`end_date`,`apply_status`,`adjust_period`,`business_type`,adjust_ratio,`rent_info`,fixed_price, `file_names`,price_unit,rent_price,subject_name,rent_start_type,`operation_type`,late_pay_ratio,late_pay_day