From ce0f5dc33432f94657a285d53aed7c74608898e9 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 22 Aug 2019 14:56:18 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=B4=A6=E5=8D=95=E7=BB=93=E7=AE=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V201908221440__L_CONTRACT.sql | 2 +- .../src/main/java/com/iformall/domain/po/WxBillRent.java | 4 +--- .../java/com/iformall/service/impl/WxBillRentServiceImpl.java | 1 + mallinkService/src/main/resources/mapper/WxBillRentMapper.xml | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V201908221440__L_CONTRACT.sql b/mallinkAdmin/src/main/resources/db/migration/V201908221440__L_CONTRACT.sql index bbd20f642..0afc547ad 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201908221440__L_CONTRACT.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201908221440__L_CONTRACT.sql @@ -1,2 +1,2 @@ alter table wx_bill_rent -add column `bus_discount_ratio` int(5) NULL DEFAULT NULL COMMENT '连营扣点跳点率'; \ No newline at end of file +add column `pay_ratio` int(5) NULL DEFAULT NULL COMMENT '连营扣点跳点率'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 460af80d8..08e7d8bd8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -176,7 +176,6 @@ public class WxBillRent extends BaseEntity { @Transient private Long deposit; - @Transient @io.swagger.annotations.ApiModelProperty(value = "联营费率", name = "payRatio") private Long payRatio; @@ -185,7 +184,6 @@ public class WxBillRent extends BaseEntity { @Transient private Integer limitEnd; - @io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayRatio") @Transient private Integer latePayDay; @@ -194,5 +192,5 @@ public class WxBillRent extends BaseEntity { private String latePayMoneyBefore; @Transient private String latePayMoneyUpdate; - + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index bef858971..1213ba003 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -323,6 +323,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { wxBillRent.setUpdatetime(new Date()); //如果在跳点区间中,修改扣点率 + wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); if(StringUtils.isNotBlank(wxRentContract.getBusDiscountRatio())){ wxRentContract.setPayRatio(ratio); diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 3948b1c75..e5a01497e 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -40,6 +40,7 @@ +