Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
f9eafb7652
4 changed files with 42 additions and 2 deletions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  3. +35
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumRentRenevueMinimunMethod.java
  4. +3
    -1
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java View File

@@ -160,7 +160,7 @@ public class WxAllBill extends TenantEntity {
public Date endtimeEqual;
@Excel(name = "付款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "6")
@io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime")
@io.swagger.annotations.ApiModelProperty(value="结束时间",name="receiveDate")
public Date receiveDate;
@TableField(exist = false)
private String receiveDateStr;


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java View File

@@ -203,6 +203,9 @@ public class WxRentContract extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "联营扣点租金取高租金固定价格", name = "revenueRentPrice")
private String revenueRentPrice;
@io.swagger.annotations.ApiModelProperty(value = "取高时保底方式EnumRentRenevueMinimunMethod", name = "revenueMinimumMethod")
private Integer revenueMinimumMethod;
@io.swagger.annotations.ApiModelProperty(value = "是否设置保底营业额", name = "revenueRatio")
private Integer revenueRatio;


+ 35
- 0
mallinkService/src/main/java/com/iformall/enums/EnumRentRenevueMinimunMethod.java View File

@@ -0,0 +1,35 @@
package com.iformall.enums;


/**
*/
public enum EnumRentRenevueMinimunMethod {

RENT(1, "租金保底"),
RENEVUE(2, "扣点保底");

public static EnumRentRenevueMinimunMethod getEnum(Integer code) {
for (EnumRentRenevueMinimunMethod value : values()) {
if (value.getCode().equals(code)) {
return value;
}
}
return null;
}

private Integer code;
private String message;

EnumRentRenevueMinimunMethod(Integer code, String message) {
this.code = code;
this.message = message;
}

public Integer getCode() {
return code;
}

public String getMessage() {
return message;
}
}

+ 3
- 1
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml View File

@@ -84,6 +84,7 @@
<result column="first_bill_receive_date" jdbcType="TIMESTAMP" property="firstBillReceiveDate"/>
<result column="shop_id_str" jdbcType="VARCHAR" property="shopIdStr"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="revenue_minimum_method" jdbcType="INTEGER" property="revenueMinimumMethod"/>
</resultMap>

<sql id="allColumns">
@@ -99,7 +100,8 @@
`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,first_bill_receive_date,
bussiness_management_fee,bussiness_management_fee_ratio_way,bussiness_management_fee_ratio,shop_id_str,
operating_management_fee,operating_management_fee_ratio_way,operating_management_fee_ratio,out_date_notify_days,out_date_notify_phone,design_file,remark
operating_management_fee,operating_management_fee_ratio_way,operating_management_fee_ratio,out_date_notify_days,
out_date_notify_phone,design_file,remark,revenue_minimum_method
</sql>




Loading…
Cancel
Save