| @@ -1,2 +1,2 @@ | |||||
| alter table wx_bill_rent | alter table wx_bill_rent | ||||
| add column `bus_discount_ratio` int(5) NULL DEFAULT NULL COMMENT '连营扣点跳点率'; | |||||
| add column `pay_ratio` int(5) NULL DEFAULT NULL COMMENT '连营扣点跳点率'; | |||||
| @@ -176,7 +176,6 @@ public class WxBillRent extends BaseEntity { | |||||
| @Transient | @Transient | ||||
| private Long deposit; | private Long deposit; | ||||
| @Transient | |||||
| @io.swagger.annotations.ApiModelProperty(value = "联营费率", name = "payRatio") | @io.swagger.annotations.ApiModelProperty(value = "联营费率", name = "payRatio") | ||||
| private Long payRatio; | private Long payRatio; | ||||
| @@ -185,7 +184,6 @@ public class WxBillRent extends BaseEntity { | |||||
| @Transient | @Transient | ||||
| private Integer limitEnd; | private Integer limitEnd; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayRatio") | @io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayRatio") | ||||
| @Transient | @Transient | ||||
| private Integer latePayDay; | private Integer latePayDay; | ||||
| @@ -194,5 +192,5 @@ public class WxBillRent extends BaseEntity { | |||||
| private String latePayMoneyBefore; | private String latePayMoneyBefore; | ||||
| @Transient | @Transient | ||||
| private String latePayMoneyUpdate; | private String latePayMoneyUpdate; | ||||
| } | } | ||||
| @@ -323,6 +323,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| wxBillRent.setUpdatetime(new Date()); | wxBillRent.setUpdatetime(new Date()); | ||||
| //如果在跳点区间中,修改扣点率 | //如果在跳点区间中,修改扣点率 | ||||
| wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); | wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); | ||||
| if(StringUtils.isNotBlank(wxRentContract.getBusDiscountRatio())){ | if(StringUtils.isNotBlank(wxRentContract.getBusDiscountRatio())){ | ||||
| wxRentContract.setPayRatio(ratio); | wxRentContract.setPayRatio(ratio); | ||||
| @@ -40,6 +40,7 @@ | |||||
| <result column="all_period" property="allPeriod"/> | <result column="all_period" property="allPeriod"/> | ||||
| <result column="pay_ratio" property="payRatio"/> | <result column="pay_ratio" property="payRatio"/> | ||||
| <result column="late_pay_day" property="latePayDay"/> | <result column="late_pay_day" property="latePayDay"/> | ||||
| <result column="late_pay_ratio" property="latePayRatio"/> | <result column="late_pay_ratio" property="latePayRatio"/> | ||||
| </resultMap> | </resultMap> | ||||