diff --git a/mallinkAdmin/src/main/resources/db/migration/V201908131046__L_CONTRACT.sql b/mallinkAdmin/src/main/resources/db/migration/V201908131046__L_CONTRACT.sql
new file mode 100644
index 000000000..7a265c598
--- /dev/null
+++ b/mallinkAdmin/src/main/resources/db/migration/V201908131046__L_CONTRACT.sql
@@ -0,0 +1,2 @@
+alter table wx_rent_contract
+add column `bus_discount_ratio` json NULL DEFAULT NULL 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 f73c066d4..d465331ee 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
@@ -232,6 +232,9 @@ public class WxRentContract extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayRatio")
private Integer latePayDay;
+ @io.swagger.annotations.ApiModelProperty(value = "联营扣点率", name = "busDiscountRatio")
+ private String busDiscountRatio;
+
public void setAdjustPeriodHandle() {
if(EnumPriceUnit.D.getCode().equals(this.getPriceUnit()) && EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode().equals(adjustPeriod)){
this.adjustPeriod = EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode();
diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml
index 87e1e490e..7247b9319 100644
--- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml
@@ -44,16 +44,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
@@ -65,7 +86,7 @@
`start_date`,`end_date`,
`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,
- `rent_input_way`,`adjust_ratio_way`,`operation_type`,late_pay_ratio,late_pay_day
+ `rent_input_way`,`adjust_ratio_way`,`operation_type`,late_pay_ratio,late_pay_day,bus_discount_ratio
@@ -127,7 +148,7 @@
bankName,rc.rent_shop_type rentShopType,rc.fix_start_date fixStartDate,rc.fix_end_date fixEndDate
,rc.business_type businessType,rc.adjust_period adjustPeriod,rc.rent_info rentInfo, rc.file_names
fileNames,rc.price_unit,rc.subject_name subjectName,rc.`rent_input_way` rentInputWay,rc.`adjust_ratio_way`
- adjustRatioWay
+ adjustRatioWay,rc.bus_discount_ratio
from wx_rent_contract rc
left join wx_shop s on rc.shop_id=s.id
left join wx_mall_floor f on s.floor=f.id