Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
a9b0afd0cc
4 changed files with 11 additions and 12 deletions
  1. +3
    -0
      mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql
  2. +4
    -7
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java
  4. +3
    -4
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 3
- 0
mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql View File

@@ -123,3 +123,6 @@ CREATE TABLE `wx_rent_contract_free_period` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='租赁合同';


ALTER TABLE wx_rent_contract DROP COLUMN bus_discount_time;
ALTER TABLE wx_rent_contract DROP COLUMN revenue_year;


+ 4
- 7
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java View File

@@ -304,13 +304,13 @@ public class WxRentContract extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "调整比例", name = "adjustRatio")
private String adjustRatio;
@io.swagger.annotations.ApiModelProperty(value = "联营扣点调整比率(仅联营面积取高时用)", name = "revenueRatioSet")
@io.swagger.annotations.ApiModelProperty(value = "联营扣点调整比率", name = "revenueRatioSet")
private String revenueRatioSet;
@io.swagger.annotations.ApiModelProperty(value = "计租周期 1日2月3自然月EnumRentContractAdjustPeriod", name = "adjustPeriod")
private Integer adjustPeriod;

@io.swagger.annotations.ApiModelProperty(value = "联营扣点率,支付比例", name = "payRatio")
@io.swagger.annotations.ApiModelProperty(value = "联营扣点比率", name = "payRatio")
private String payRatio;

@io.swagger.annotations.ApiModelProperty(value = "保底营业额", name = "revenue")
@@ -324,8 +324,8 @@ public class WxRentContract extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "是否设置保底营业额", name = "revenueRatio")
private Integer revenueRatio;
@io.swagger.annotations.ApiModelProperty(value = "调整比例", name = "adjustRatio")
private String revenueYear;
//@io.swagger.annotations.ApiModelProperty(value = "调整比例", name = "adjustRatio")
//private String revenueYear;

@io.swagger.annotations.ApiModelProperty(value = "计租日", name = "startDate")
private Date startDate;
@@ -421,9 +421,6 @@ public class WxRentContract extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "联营扣点跳点设置", name = "busDiscountRatio")
private String busDiscountRatio;

// @io.swagger.annotations.ApiModelProperty(value = "联营扣点跳点-时间范围 1年2月3周期", name = "busDiscountTime")
// private Integer busDiscountTime;
@io.swagger.annotations.ApiModelProperty(value = "查询店铺", name = "queryShopId")
@TableField(exist = false)
private Long queryShopId;


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java View File

@@ -152,7 +152,7 @@ public class WxRentContractHelper {
//BigDecimal priceD = new BigDecimal(wxRentContract.getPrice());
//联营保底营业额。
String revenueYear = wxRentContract.getRevenueYear();
String revenueYear = wxRentContract.getRevenueRatioSet();
List<Long> revenueYears = null;
if (!StringUtils.isBlank(revenueYear)) {
revenueYears = JSONArray.parseArray(revenueYear, Long.class);


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

@@ -64,7 +64,6 @@
<result column="type" jdbcType="INTEGER" property="type"/>
<result column="revenue" jdbcType="VARCHAR" property="revenue"/>
<result column="revenue_ratio" jdbcType="INTEGER" property="revenueRatio"/>
<result column="revenue_year" jdbcType="VARCHAR" property="revenueYear"/>
<result column="revenue_ratio_way" jdbcType="INTEGER" property="revenueRatioWay"/>
<result column="revenue_ratio_set" jdbcType="VARCHAR" property="revenueRatioSet"/>
<result column="adjust_ratio" jdbcType="VARCHAR" property="adjustRatio"/>
@@ -142,7 +141,7 @@
`property_name`,`property_fee`,`fee_cycle`,`water_fee`,`electricity_fees`,`month_average_days`,
`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`,
`pay_account`,`filename`,`lease`,`type`,`revenue`,`revenue_ratio`,`revenue_ratio_way`,`revenue_ratio_set`,`adjust_ratio`,`adjust_period`,`pay_ratio`,
`start_date`,`end_date`,`shop_name`,`from_id`,`end_contract_time`,`revenue_fixed_rent_price`,`revenue_rent_price`,
`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,
@@ -487,7 +486,7 @@
rc.`property_name`,rc.`property_fee`,rc.`fee_cycle`,rc.`water_fee`,rc.`electricity_fees`,
rc.`deposit`,rc.cashtype_content_lsit,rc.cashtype_lsit,rc.`pay_date`,rc.`is_del`,rc.`merchant_name`,
rc.`brand`,rc.`business_id`,rc.`shop_type`,rc.`shop_type_str`,rc.`updatetime`,rc.`createtime`,rc.`link_person`,rc.`link_phone`,rc.`link_address`,
rc.`pay_account`,rc.`filename`,rc.`lease`,rc.`type`,rc.`revenue`,rc.`revenue_ratio`,rc.`revenue_year`,rc.`revenue_ratio_way`,rc.`revenue_ratio_set`,rc.`adjust_ratio`,rc.`adjust_period`,rc.`pay_ratio`,
rc.`pay_account`,rc.`filename`,rc.`lease`,rc.`type`,rc.`revenue`,rc.`revenue_ratio`,rc.`revenue_ratio_way`,rc.`revenue_ratio_set`,rc.`adjust_ratio`,rc.`adjust_period`,rc.`pay_ratio`,
rc.`start_date`,rc.`end_date`,rc.`shop_name`,rc.`from_id`,`rc.end_contract_time`,
rc.`apply_status`,rc.`bank_name`,rc.`rent_shop_type`,rc.`fix_start_date`,rc.`fix_end_date`,
rc.`business_type`,rc.`rent_info`, rc.`file_names`,rc.price_unit,rent_price,rc.other_rent_price_info,rc.`subject_name`,rc.rent_start_type,
@@ -514,7 +513,7 @@
rc.`property_name`,rc.`property_fee`,rc.`fee_cycle`,rc.`water_fee`,rc.`electricity_fees`,
rc.`deposit`,rc.cashtype_content_lsit,rc.cashtype_lsit,rc.`pay_date`,rc.`is_del`,rc.`merchant_name`,
rc.`brand`,rc.`business_id`,rc.`shop_type`,rc.`shop_type_str`,rc.`updatetime`,rc.`createtime`,rc.`link_person`,rc.`link_phone`,rc.`link_address`,
rc.`pay_account`,rc.`filename`,rc.`lease`,rc.`type`,rc.`revenue`,rc.`revenue_ratio`,rc.`revenue_year`,rc.`revenue_ratio_way`,rc.`revenue_ratio_set`,rc.`adjust_ratio`,rc.`adjust_period`,rc.`pay_ratio`,
rc.`pay_account`,rc.`filename`,rc.`lease`,rc.`type`,rc.`revenue`,rc.`revenue_ratio`,rc.`revenue_ratio_way`,rc.`revenue_ratio_set`,rc.`adjust_ratio`,rc.`adjust_period`,rc.`pay_ratio`,
rc.`start_date`,rc.`end_date`,rc.`shop_name`,rc.`from_id`,rc.`end_contract_time`,
rc.`apply_status`,rc.`bank_name`,rc.`rent_shop_type`,rc.`fix_start_date`,rc.`fix_end_date`,
rc.`business_type`,rc.`rent_info`, rc.`file_names`,rc.price_unit,rent_price,rc.other_rent_price_info,rc.`subject_name`,rc.rent_start_type,


Loading…
Cancel
Save