diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
index 68a04207e..8bd39fc07 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
@@ -326,6 +326,11 @@ public class WxRentContractController extends BaseController {
if(StringUtils.isNotBlank(payAccountBill.getBankAccountName()) && StringUtils.isNotBlank(payAccountBill.getBankCardId())) {
map.put("bankAccountName", payAccountBill.getBankAccountName());
map.put("bankCardId", payAccountBill.getBankCardId());
+ if(payAccountBill.getServiceChargeRate() == null){
+ map.put("serviceChargeRate", "0");
+ }else{
+ map.put("serviceChargeRate", payAccountBill.getServiceChargeRate()+"");
+ }
}
return new ResultData(map);
}
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java
index 62c3fef89..e173ed315 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java
@@ -110,7 +110,6 @@ public class WxBillDaily extends BaseEntity {
private Integer buildWay;
@io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay")
- @TableField(exist = false)
private Integer serviceChargePay;
@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay")
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java
index 17fb74d36..d52a06d3e 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java
@@ -78,7 +78,6 @@ public class WxBillDeposit extends BaseEntity {
private Integer freeze;
@io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay")
- @TableField(exist = false)
private Integer serviceChargePay;
@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay")
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java
index 0611119dc..100abd9eb 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java
@@ -132,7 +132,6 @@ public class WxBillOther extends BaseEntity {
private Integer freeze;
@io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay")
- @TableField(exist = false)
private Integer serviceChargePay;
@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay")
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java
index 730593a2a..74519dfb4 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java
@@ -141,7 +141,6 @@ public class WxBillOtherDeposit extends BaseEntity {
private Integer freeze;
@io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay")
- @TableField(exist = false)
private Integer serviceChargePay;
@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay")
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
index a505a51e7..712b5651f 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
@@ -186,10 +186,14 @@ public class WxBillProperty extends BaseEntity {
private Integer freeze;
@io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay")
- @TableField(exist = false)
private Integer serviceChargePay;
@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay")
@TableField(exist = false)
private Long realReceivePay;
+
+ @TableField(exist = false)
+ private String serviceChargePayBefore;
+ @TableField(exist = false)
+ private String serviceChargePayUpdate;
}
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java
index 99f0ba070..0c94f8136 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java
@@ -76,7 +76,6 @@ public class WxBillPropertyDeposit extends BaseEntity {
private Integer freeze;
@io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay")
- @TableField(exist = false)
private Integer serviceChargePay;
@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay")
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 5d354882b..e3a10aaaf 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
@@ -197,11 +197,14 @@ public class WxBillRent extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "联营租金", name = "joinRentPrice")
private Long joinRentPrice;
-
@io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay")
- @TableField(exist = false)
private Integer serviceChargePay;
+ @TableField(exist = false)
+ private String serviceChargePayBefore;
+ @TableField(exist = false)
+ private String serviceChargePayUpdate;
+
@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay")
@TableField(exist = false)
private Long realReceivePay;
diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBillAction.java b/mallinkService/src/main/java/com/iformall/enums/EnumBillAction.java
index 1b6e74503..603c73c7b 100644
--- a/mallinkService/src/main/java/com/iformall/enums/EnumBillAction.java
+++ b/mallinkService/src/main/java/com/iformall/enums/EnumBillAction.java
@@ -14,7 +14,8 @@ public enum EnumBillAction {
DEPOSIT_MODIFY(6, "押金变更"),
IMPORT_PAY(6, "导入缴费"),
UPDATE_LATE_PAY_MONEY(7, "滞纳金变更"),
- UPDATE_SETTLE_MONEY(8, "结算单清算");
+ UPDATE_SETTLE_MONEY(8, "结算单清算"),
+ UPDATE_SERVICE_MONEY(9, "手续费变更");
public static EnumBillAction getEnum(Integer code) {
for (EnumBillAction value : values()) {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java
index 9d388fd77..13dfe4f80 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java
@@ -67,7 +67,12 @@ public class WxBillDailyServiceImpl implements WxBillDailyService {
//手续费 = 合同应收+手续费+滞纳金
if(e.getReceivePay() != null){
if(e.getLatePayPrice() == null) e.setLatePayPrice(0l);
- BigDecimal servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP);
+ BigDecimal servicePay;
+ if(e.getServiceChargePay() != null){
+ servicePay = new BigDecimal(e.getServiceChargePay());
+ }else{
+ servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP);
+ }
Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay();
e.setRealReceivePay(realReceivePay);
e.setServiceChargePay(servicePay.intValue());
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java
index d9501a00f..98a37c45c 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java
@@ -57,7 +57,12 @@ public class WxBillDepositServiceImpl implements WxBillDepositService {
//手续费 = 合同应收+手续费+滞纳金
if(e.get("receivePay") != null){
Long receivePayB = (Long)e.get("receivePay");
- BigDecimal servicePay = new BigDecimal(receivePayB).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP);
+ BigDecimal servicePay;
+ if(e.get("serviceChargePay") != null){
+ servicePay = new BigDecimal((Long)e.get("serviceChargePay"));
+ }else{
+ servicePay = new BigDecimal(receivePayB).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP);
+ }
Long realReceivePay = servicePay.longValue() + receivePayB;
e.put("realReceivePay",realReceivePay);
e.put("serviceChargePay",servicePay.intValue());
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java
index 5e69ae6d9..92d24695d 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java
@@ -61,7 +61,12 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService
//手续费 = 合同应收+手续费+滞纳金
if(e.getReceivePay() != null){
if(e.getLatePayPrice() == null) e.setLatePayPrice(0l);
- BigDecimal servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP);
+ BigDecimal servicePay;
+ if(e.getServiceChargePay() != null){
+ servicePay = new BigDecimal(e.getServiceChargePay());
+ }else{
+ servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP);
+ }
Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay();
e.setRealReceivePay(realReceivePay);
e.setServiceChargePay(servicePay.intValue());
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java
index 49ecfd152..9064cf270 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java
@@ -61,7 +61,12 @@ public class WxBillOtherServiceImpl implements WxBillOtherService {
//手续费 = 合同应收+手续费+滞纳金
if(e.getReceivePay() != null){
if(e.getLatePayPrice() == null) e.setLatePayPrice(0l);
- BigDecimal servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP);
+ BigDecimal servicePay;
+ if(e.getServiceChargePay() != null){
+ servicePay = new BigDecimal(e.getServiceChargePay());
+ }else{
+ servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP);
+ }
Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay();
e.setRealReceivePay(realReceivePay);
e.setServiceChargePay(servicePay.intValue());
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java
index 729922016..578423b0d 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java
@@ -55,7 +55,12 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe
//手续费 = 合同应收+手续费+滞纳金
if(e.get("receivePay") != null){
Long receivePayB = (Long)e.get("receivePay");
- BigDecimal servicePay = new BigDecimal(receivePayB).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP);
+ BigDecimal servicePay;
+ if(e.get("serviceChargePay") != null){
+ servicePay = new BigDecimal((Long)e.get("serviceChargePay"));
+ }else{
+ servicePay = new BigDecimal(receivePayB).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP);
+ }
Long realReceivePay = servicePay.longValue() + receivePayB;
e.put("realReceivePay",realReceivePay);
e.put("serviceChargePay",servicePay.intValue());
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java
index c3949312b..1e15422b1 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java
@@ -66,7 +66,12 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService {
//手续费 = 合同应收+手续费+滞纳金
if(e.getReceivePay() != null){
if(e.getLatePayPrice() == null) e.setLatePayPrice(0l);
- BigDecimal servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP);
+ BigDecimal servicePay;
+ if(e.getServiceChargePay() != null){
+ servicePay = new BigDecimal(e.getServiceChargePay());
+ }else{
+ servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP);
+ }
Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay();
e.setRealReceivePay(realReceivePay);
e.setServiceChargePay(servicePay.intValue());
@@ -309,6 +314,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService {
if(record.getLatePayMoneyUpdate() != null) {
record.setLatePayPrice(Long.parseLong(record.getLatePayMoneyUpdate()) * 100);
}
+ if(record.getServiceChargePay() != null) {
+ record.setServiceChargePay(record.getServiceChargePay() * 100);
+ }
wxBillPropertyMapper.updateById(record);
final IdWorker idWorker = IdWorker.get();
@@ -321,6 +329,19 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService {
billAction.setDetails(record.getLatePayMoneyBefore()+"元变更为" +record.getLatePayMoneyUpdate()+"元");
billAction.setUpdatetime(new Date());
wxBillActionMapper.insert(billAction);
+
+ if(record.getServiceChargePay() != null) {
+ billAction = new WxBillAction();
+ billAction.setId(idWorker.nextId());
+ billAction.setCreatetime(new Date());
+ billAction.setUserName("系统端");
+ billAction.setAction(EnumBillAction.UPDATE_SERVICE_MONEY.getCode());
+ billAction.setBillId(record.getId());
+ billAction.setDetails(record.getServiceChargePayBefore()+"元变更为" +record.getServiceChargePayUpdate()+"元");
+ billAction.setUpdatetime(new Date());
+ wxBillActionMapper.insert(billAction);
+ }
+
return new ResultData();
}
}
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 8021db98d..13b8067af 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
@@ -70,7 +70,12 @@ public class WxBillRentServiceImpl implements WxBillRentService {
//手续费 = 合同应收+手续费+滞纳金
if(e.getReceivePay() != null){
if(e.getLatePayPrice() == null) e.setLatePayPrice(0l);
- BigDecimal servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP);
+ BigDecimal servicePay;
+ if(e.getServiceChargePay() != null){
+ servicePay = new BigDecimal(e.getServiceChargePay());
+ }else{
+ servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP);
+ }
Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay();
e.setRealReceivePay(realReceivePay);
e.setServiceChargePay(servicePay.intValue());
@@ -423,9 +428,12 @@ public class WxBillRentServiceImpl implements WxBillRentService {
if(record.getLatePayMoneyUpdate() != null) {
record.setLatePayPrice(Long.parseLong(record.getLatePayMoneyUpdate()) * 100);
}
+ if(record.getServiceChargePay() != null) {
+ record.setServiceChargePay(record.getServiceChargePay() * 100);
+ }
+
wxBillRentMapper.updateById(record);
final IdWorker idWorker = IdWorker.get();
-
WxBillAction billAction = new WxBillAction();
billAction.setId(idWorker.nextId());
billAction.setCreatetime(new Date());
@@ -435,6 +443,18 @@ public class WxBillRentServiceImpl implements WxBillRentService {
billAction.setDetails(record.getLatePayMoneyBefore()+"元变更为" +record.getLatePayMoneyUpdate()+"元");
billAction.setUpdatetime(new Date());
wxBillActionMapper.insert(billAction);
+
+ if(record.getServiceChargePay() != null) {
+ billAction = new WxBillAction();
+ billAction.setId(idWorker.nextId());
+ billAction.setCreatetime(new Date());
+ billAction.setUserName("系统端");
+ billAction.setAction(EnumBillAction.UPDATE_SERVICE_MONEY.getCode());
+ billAction.setBillId(record.getId());
+ billAction.setDetails(record.getServiceChargePayBefore()+"元变更为" +record.getServiceChargePayUpdate()+"元");
+ billAction.setUpdatetime(new Date());
+ wxBillActionMapper.insert(billAction);
+ }
return new ResultData();
}
}
diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml
index 6978678fc..33efb3dcc 100644
--- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml
@@ -28,13 +28,13 @@
-
+
`id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,
`tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`type`,
- `rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way
+ `rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay
@@ -77,7 +77,7 @@
select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day` ,
case when br.status=1 then br.owe else 0 end owe,br.`status`,m.`name` merchant_name,s.shop_number,
br.`updatetime`,br.`merchant_id`,br.shop_id,br.type,br.`rent_shop_type`,br.pay_way,br.price_detail,
- br.`starttime`,br.`endtime`,br.`build_way`,br.freeze
+ br.`starttime`,br.`endtime`,br.`build_way`,br.freeze,br.service_charge_pay
from wx_bill_daily br left join wx_merchant m on br.merchant_id=m.id
left join wx_shop s on br.shop_id=s.id
diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml
index 1d5bcc190..ebede0fee 100644
--- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml
@@ -22,13 +22,13 @@
-
+
`id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,
`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,
- `rent_shop_type`,`return_price`,`pay_way`
+ `rent_shop_type`,`return_price`,`pay_way`,service_charge_pay
@@ -67,13 +67,12 @@
-