xhxu 5 лет назад
Родитель
Сommit
a5b5278a25
3 измененных файлов: 19 добавлений и 3 удалений
  1. +3
    -0
      mallinkAdmin/src/main/resources/db/migration/V202102260001__wx_rent_contract.sql
  2. +6
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  3. +10
    -3
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 3
- 0
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`;

+ 6
- 0
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;



+ 10
- 3
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Просмотреть файл

@@ -15,6 +15,9 @@
<result column="status" jdbcType="INTEGER" property="status"/>
<result column="contract_number" jdbcType="VARCHAR" property="contractNumber"/>
<result column="deposit" jdbcType="INTEGER" property="deposit"/>

<result column="deposit_info" jdbcType="VARCHAR" property="depositInfo"/>

<result column="pay_date" jdbcType="INTEGER" property="payDate"/>
<result column="is_del" jdbcType="INTEGER" property="isDel"/>
<result column="merchant_name" jdbcType="VARCHAR" property="merchantName"/>
@@ -46,8 +49,12 @@
<result column="file_names" jdbcType="VARCHAR" property="fileNames"/>
<result column="price_unit" property="priceUnit"/>
<result column="rent_price" property="rentPrice"/>

<result column="other_rent_price_info" jdbcType="VARCHAR" property="otherRentPriceInfo"/>

<result column="subject_name" property="subjectName"/>
<result column="rent_start_type" property="rentStartType"/><result column="type" jdbcType="INTEGER" property="type"/>
<result column="rent_start_type" property="rentStartType"/>
<result column="type" jdbcType="INTEGER" property="type"/>
<result column="revenue" jdbcType="INTEGER" property="revenue"/>
<result column="adjust_ratio" jdbcType="VARCHAR" property="adjustRatio"/>
<result column="adjust_period" jdbcType="INTEGER" property="adjustPeriod"/>
@@ -82,12 +89,12 @@

<sql id="allColumns">
`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
</sql>



Загрузка…
Отмена
Сохранить