diff --git a/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql b/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql index 080953d09..3ea04377e 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql @@ -2,4 +2,3 @@ ALTER TABLE wx_rent_contract ADD COLUMN day_price_calcute INT(1) NOT NULL DEFAUL ALTER TABLE wx_rent_contract ADD COLUMN month_average_days INT(2) COMMENT '每月平均天数'; ALTER TABLE wx_property_contract ADD COLUMN day_price_calcute INT(1) NOT NULL DEFAULT 1 COMMENT '每天价格计算规则'; ALTER TABLE wx_property_contract ADD COLUMN month_average_days INT(2) COMMENT '每月平均天数'; -ALTER TABLE wx_rent_contract ADD COLUMN fixed_price INT(1) NOT NULL DEFAULT 0 COMMENT '是否固定价格'; \ 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 ae9a29022..7e0ec2c46 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -229,8 +229,6 @@ public class WxRentContract extends TenantEntity { private String price; @TableField(exist = false) private String priceTwoDecimal;//2位小数 - @io.swagger.annotations.ApiModelProperty(value = "是否固定租金", name = "fixedPrice") - private Integer fixedPrice; @io.swagger.annotations.ApiModelProperty(value = "起租开始时间", name = "rentalStartDate") private Date rentalStartDate; @io.swagger.annotations.ApiModelProperty(value = "", name = "rentalEndDate") diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 3acf6f8a4..2b778ee86 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -130,7 +130,6 @@ - @@ -143,7 +142,7 @@ `deposit`,cashtype_content_lsit,cashtype_lsit,`pay_date`,`is_del`,`merchant_name`, `brand`,`business_id`,`shop_type`,`shop_type_str`,`updatetime`,`createtime`,`link_person`,`link_phone`,`link_address`, `pay_account`,`filename`,`lease`,`type`,`revenue`,`revenue_ratio`,`revenue_year`,`revenue_ratio_way`,`revenue_ratio_set`,`adjust_ratio`,`adjust_period`,`pay_ratio`, - `start_date`,`end_date`,`shop_name`,`from_id`,`end_contract_time`,`fixed_price`, + `start_date`,`end_date`,`shop_name`,`from_id`,`end_contract_time`, `apply_status`,`bank_name`,`rent_shop_type`,`fix_start_date`,`fix_end_date`, `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, @@ -196,7 +195,6 @@ and json_contains(json_extract(rent_info,'$[*].id'),concat('"',#{queryShopId},'"')) and `day_price_calcute` = #{dayPriceCalcute} and `month_average_days` = #{monthAverageDays} - and `fixed_price` = #{fixedPrice} and shop_name like concat('%',#{shopNumber},'%') @@ -380,13 +378,12 @@ -