diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBillUpdateType.java b/mallinkService/src/main/java/com/iformall/enums/EnumBillUpdateType.java new file mode 100644 index 000000000..346688dcd --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBillUpdateType.java @@ -0,0 +1,37 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumBillUpdateType { + + + LATEPAY(2, "滞纳金"), + OTHER(1, "其他"), + ; + + public static EnumBillUpdateType getEnum(Integer code) { + for (EnumBillUpdateType value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumBillUpdateType(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 18986d3f7..4a6cc94f9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -784,7 +784,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { if(oldLatePrice != null){ wxBillRent.setLatePayPrice(newLatePrice); wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); - addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY,id, oldPrice, newPrice, user); + addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY,id, oldLatePrice, newLatePrice, user); }else{ //租赁账单更新 wxBillRent.setReceivePay(newPrice); @@ -819,7 +819,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { if(oldLatePrice != null){ wxBillProperty.setLatePayPrice(newLatePrice); wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillProperty); - addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY,id, oldPrice, newPrice, user); + addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY,id, oldLatePrice, newLatePrice, user); }else{ wxBillProperty.setReceivePay(newPrice); wxBillProperty.setOwe(newPrice - dbBill.getPay()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index c8179a9da..e968d89c6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -201,25 +201,20 @@ public class WxFlowServiceImpl implements WxFlowService { //账单审批 Integer billType = (Integer) getVariableByKey(variables, "billType"); MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession"); - String latePayMoneyBefore = (String) getVariableByKey(variables, "latePayMoneyBefore"); - String latePayMoneyUpdate = (String) getVariableByKey(variables, "latePayMoneyUpdate"); - if(StringUtils.isNotBlank(latePayMoneyBefore)){ //修改滞纳金 - WxBillAll wxBillAll = new WxBillAll(); - wxBillAll.setId(businessId); - wxBillAll.setBillTypeValue(billType); - wxBillAll.setOldLatePrice(Long.parseLong(latePayMoneyBefore)*100); - wxBillAll.setNewLatePrice(Long.parseLong(latePayMoneyUpdate)*100); - wxBillAllService.updateReceivePay(wxBillAll, user); + Integer billUpdateType = (Integer) getVariableByKey(variables, "billUpdateType"); + Long oldPrice = Long.parseLong(getVariableByKey(variables, "oldPrice").toString()); + Long newPrice = Long.parseLong(getVariableByKey(variables, "newPrice").toString()); + WxBillAll wxBillAll = new WxBillAll(); + wxBillAll.setId(businessId); + wxBillAll.setBillTypeValue(billType); + if(EnumBillUpdateType.LATEPAY.getCode().equals(billUpdateType)){ //修改滞纳金 + wxBillAll.setOldLatePrice(oldPrice); + wxBillAll.setNewLatePrice(newPrice); }else{ - Long oldPrice = Long.parseLong(getVariableByKey(variables, "oldPrice").toString()); - Long newPrice = Long.parseLong(getVariableByKey(variables, "newPrice").toString()); - WxBillAll wxBillAll = new WxBillAll(); - wxBillAll.setId(businessId); - wxBillAll.setBillTypeValue(billType); wxBillAll.setOldPrice(oldPrice); wxBillAll.setNewPrice(newPrice); - wxBillAllService.updateReceivePay(wxBillAll, user); } + wxBillAllService.updateReceivePay(wxBillAll, user); } } else if (EnumFlowKey.NEW_COUPON_UPLINE.getCode().equals(flowType) || EnumFlowKey.NEW_CARD_UPLINE.getCode().equals(flowType)