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 c631a33a8..9f706c889 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -310,9 +310,6 @@ public class WxRentContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "联营扣点比率", name = "payRatio") private String payRatio; -// @io.swagger.annotations.ApiModelProperty(value = "联营扣点跳点设置", name = "busDiscountRatio") -// private String busDiscountRatio; - @io.swagger.annotations.ApiModelProperty(value = "保底营业额", name = "revenue") private String revenue; @@ -492,6 +489,7 @@ public class WxRentContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "合同类型", name = "contractType") private Integer contractType; + //联营扣点跳点设置 @TableField(exist = false) private List revenueJumps; @io.swagger.annotations.ApiModelProperty(value = "联营跳点设置说明", name = "revenueJumpsRemark") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index dc94bb5b3..e7cf878fd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -754,12 +754,14 @@ public class WxRentContractServiceImpl implements WxRentContractService { List jlist = new ArrayList(); for (int i = 0 ; i < record.getRevenueJumps().size(); i++) { WxRentContractRevenueJump jp = record.getRevenueJumps().get(i); - jp.updateTenantInfo(record); - jp.setId(idWorker.nextId()); - jp.setRentContractId(record.getId()); - jp.setCreateTime(new Date()); - jp.setUpdateTime(new Date()); - jlist.add(jp); + if (StringUtils.isNotBlank(jp.getMinMoney())) { + jp.updateTenantInfo(record); + jp.setId(idWorker.nextId()); + jp.setRentContractId(record.getId()); + jp.setCreateTime(new Date()); + jp.setUpdateTime(new Date()); + jlist.add(jp); + } } if (jlist.size() > 0 ) { wxRentContractRevenueJumpMapper.inertJumps(record.getTenantId(), jlist);