| @@ -143,6 +143,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { | |||||
| if(wxBillDaily==null){ | if(wxBillDaily==null){ | ||||
| return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); | return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); | ||||
| } | } | ||||
| Integer addpay = wxBillDaily.getPay(); | |||||
| wxBillDaily.setPayDate(record.getPayDate()); | wxBillDaily.setPayDate(record.getPayDate()); | ||||
| wxBillDaily.setPay(record.getPay()); | wxBillDaily.setPay(record.getPay()); | ||||
| wxBillDaily.setReceivePay(record.getReceivePay()); | wxBillDaily.setReceivePay(record.getReceivePay()); | ||||
| @@ -160,7 +161,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { | |||||
| WxBillAction wxBillAction = new WxBillAction(); | WxBillAction wxBillAction = new WxBillAction(); | ||||
| wxBillAction.setBillId(wxBillDaily.getId()); | wxBillAction.setBillId(wxBillDaily.getId()); | ||||
| String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); | String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); | ||||
| String price = new BigDecimal(record.getPay()).divide(new BigDecimal(100)).toPlainString(); | |||||
| String price = new BigDecimal(record.getPay() - addpay).divide(new BigDecimal(100)).toPlainString(); | |||||
| wxBillAction.setDetails(message + price + "元"); | wxBillAction.setDetails(message + price + "元"); | ||||
| wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); | wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); | ||||
| wxBillAction.setUserId(user.getId()); | wxBillAction.setUserId(user.getId()); | ||||
| @@ -128,6 +128,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { | |||||
| if(wxBillDeposit==null){ | if(wxBillDeposit==null){ | ||||
| return new ResultData(ErrorCode.BILL_RENT_DEPOSIT_IS_NOT_FOUND); | return new ResultData(ErrorCode.BILL_RENT_DEPOSIT_IS_NOT_FOUND); | ||||
| } | } | ||||
| Integer addpay = wxBillDeposit.getPay(); | |||||
| wxBillDeposit.setPayDate(record.getPayDate()); | wxBillDeposit.setPayDate(record.getPayDate()); | ||||
| wxBillDeposit.setPay(record.getPay()); | wxBillDeposit.setPay(record.getPay()); | ||||
| wxBillDeposit.setReceivePay(record.getReceivePay()); | wxBillDeposit.setReceivePay(record.getReceivePay()); | ||||
| @@ -145,7 +146,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { | |||||
| WxBillAction wxBillAction = new WxBillAction(); | WxBillAction wxBillAction = new WxBillAction(); | ||||
| wxBillAction.setBillId(wxBillDeposit.getId()); | wxBillAction.setBillId(wxBillDeposit.getId()); | ||||
| String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); | String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); | ||||
| String price = new BigDecimal(record.getPay()).divide(new BigDecimal(100)).toPlainString(); | |||||
| String price = new BigDecimal(record.getPay() - addpay).divide(new BigDecimal(100)).toPlainString(); | |||||
| wxBillAction.setDetails(message + price + "元"); | wxBillAction.setDetails(message + price + "元"); | ||||
| wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); | wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); | ||||
| wxBillAction.setUserId(user.getId()); | wxBillAction.setUserId(user.getId()); | ||||
| @@ -144,6 +144,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService | |||||
| if (wxBillOtherDeposit == null) { | if (wxBillOtherDeposit == null) { | ||||
| return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); | return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); | ||||
| } | } | ||||
| Integer addpay = wxBillOtherDeposit.getPay(); | |||||
| wxBillOtherDeposit.setPayDate(record.getPayDate()); | wxBillOtherDeposit.setPayDate(record.getPayDate()); | ||||
| wxBillOtherDeposit.setPay(record.getPay()); | wxBillOtherDeposit.setPay(record.getPay()); | ||||
| wxBillOtherDeposit.setReceivePay(record.getReceivePay()); | wxBillOtherDeposit.setReceivePay(record.getReceivePay()); | ||||
| @@ -161,7 +162,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService | |||||
| WxBillAction wxBillAction = new WxBillAction(); | WxBillAction wxBillAction = new WxBillAction(); | ||||
| wxBillAction.setBillId(wxBillOtherDeposit.getId()); | wxBillAction.setBillId(wxBillOtherDeposit.getId()); | ||||
| String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); | String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); | ||||
| String price = new BigDecimal(record.getPay()).divide(new BigDecimal(100)).toPlainString(); | |||||
| String price = new BigDecimal(record.getPay() - addpay).divide(new BigDecimal(100)).toPlainString(); | |||||
| wxBillAction.setDetails(message + price + "元"); | wxBillAction.setDetails(message + price + "元"); | ||||
| wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); | wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); | ||||
| wxBillAction.setUserId(user.getId()); | wxBillAction.setUserId(user.getId()); | ||||
| @@ -143,6 +143,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { | |||||
| if(wxBillOther==null){ | if(wxBillOther==null){ | ||||
| return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); | return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); | ||||
| } | } | ||||
| Integer addpay = wxBillOther.getPay(); | |||||
| wxBillOther.setPayDate(record.getPayDate()); | wxBillOther.setPayDate(record.getPayDate()); | ||||
| wxBillOther.setPay(record.getPay()); | wxBillOther.setPay(record.getPay()); | ||||
| wxBillOther.setReceivePay(record.getReceivePay()); | wxBillOther.setReceivePay(record.getReceivePay()); | ||||
| @@ -160,7 +161,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { | |||||
| WxBillAction wxBillAction = new WxBillAction(); | WxBillAction wxBillAction = new WxBillAction(); | ||||
| wxBillAction.setBillId(wxBillOther.getId()); | wxBillAction.setBillId(wxBillOther.getId()); | ||||
| String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); | String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); | ||||
| String price = new BigDecimal(record.getPay()).divide(new BigDecimal(100)).toPlainString(); | |||||
| String price = new BigDecimal(record.getPay() - addpay).divide(new BigDecimal(100)).toPlainString(); | |||||
| wxBillAction.setDetails(message + price + "元"); | wxBillAction.setDetails(message + price + "元"); | ||||
| wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); | wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); | ||||
| wxBillAction.setUserId(user.getId()); | wxBillAction.setUserId(user.getId()); | ||||
| @@ -128,6 +128,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe | |||||
| if(record==null){ | if(record==null){ | ||||
| return new ResultData(ErrorCode.BILL_PROPERTY_DEPOSIT_IS_NOT_FOUND); | return new ResultData(ErrorCode.BILL_PROPERTY_DEPOSIT_IS_NOT_FOUND); | ||||
| } | } | ||||
| Integer addpay = wxBillDeposit.getPay(); | |||||
| wxBillDeposit.setPayDate(record.getPayDate()); | wxBillDeposit.setPayDate(record.getPayDate()); | ||||
| wxBillDeposit.setPay(record.getPay()); | wxBillDeposit.setPay(record.getPay()); | ||||
| wxBillDeposit.setReceivePay(record.getReceivePay()); | wxBillDeposit.setReceivePay(record.getReceivePay()); | ||||
| @@ -145,7 +146,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe | |||||
| WxBillAction wxBillAction = new WxBillAction(); | WxBillAction wxBillAction = new WxBillAction(); | ||||
| wxBillAction.setBillId(wxBillDeposit.getId()); | wxBillAction.setBillId(wxBillDeposit.getId()); | ||||
| String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); | String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); | ||||
| String price = new BigDecimal(record.getPay()).divide(new BigDecimal(100)).toPlainString(); | |||||
| String price = new BigDecimal(record.getPay() - addpay).divide(new BigDecimal(100)).toPlainString(); | |||||
| wxBillAction.setDetails(message + price + "元"); | wxBillAction.setDetails(message + price + "元"); | ||||
| wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); | wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); | ||||
| wxBillAction.setUserId(user.getId()); | wxBillAction.setUserId(user.getId()); | ||||
| @@ -127,6 +127,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||||
| if(property==null){ | if(property==null){ | ||||
| return new ResultData(ErrorCode.BILL_PROPERTY_IS_NOT_FOUND); | return new ResultData(ErrorCode.BILL_PROPERTY_IS_NOT_FOUND); | ||||
| } | } | ||||
| Integer addpay = property.getPay(); | |||||
| property.setRevenue(record.getRevenue()); | property.setRevenue(record.getRevenue()); | ||||
| property.setLatePayRatio(record.getLatePayRatio()); | property.setLatePayRatio(record.getLatePayRatio()); | ||||
| property.setLatePayTime(record.getLatePayTime()); | property.setLatePayTime(record.getLatePayTime()); | ||||
| @@ -147,7 +148,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||||
| WxBillAction wxBillAction = new WxBillAction(); | WxBillAction wxBillAction = new WxBillAction(); | ||||
| wxBillAction.setBillId(property.getId()); | wxBillAction.setBillId(property.getId()); | ||||
| String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); | String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); | ||||
| String price = new BigDecimal(record.getPay()).divide(new BigDecimal(100)).toPlainString(); | |||||
| String price = new BigDecimal(record.getPay() - addpay).divide(new BigDecimal(100)).toPlainString(); | |||||
| wxBillAction.setDetails(message + price + "元"); | wxBillAction.setDetails(message + price + "元"); | ||||
| wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); | wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); | ||||
| wxBillAction.setUserId(user.getId()); | wxBillAction.setUserId(user.getId()); | ||||
| @@ -127,6 +127,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| if(wxBillRent==null){ | if(wxBillRent==null){ | ||||
| return new ResultData(ErrorCode.BILL_RENT_IS_NOT_FOUND); | return new ResultData(ErrorCode.BILL_RENT_IS_NOT_FOUND); | ||||
| } | } | ||||
| Integer addpay = wxBillRent.getPay(); | |||||
| wxBillRent.setRevenue(record.getRevenue()); | wxBillRent.setRevenue(record.getRevenue()); | ||||
| wxBillRent.setLatePayRatio(record.getLatePayRatio()); | wxBillRent.setLatePayRatio(record.getLatePayRatio()); | ||||
| wxBillRent.setLatePayTime(record.getLatePayTime()); | wxBillRent.setLatePayTime(record.getLatePayTime()); | ||||
| @@ -147,7 +148,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| WxBillAction wxBillAction = new WxBillAction(); | WxBillAction wxBillAction = new WxBillAction(); | ||||
| wxBillAction.setBillId(wxBillRent.getId()); | wxBillAction.setBillId(wxBillRent.getId()); | ||||
| String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); | String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); | ||||
| String price = new BigDecimal(record.getPay()).divide(new BigDecimal(100)).toPlainString(); | |||||
| String price = new BigDecimal(record.getPay() - addpay).divide(new BigDecimal(100)).toPlainString(); | |||||
| wxBillAction.setDetails(message + price + "元"); | wxBillAction.setDetails(message + price + "元"); | ||||
| wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); | wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); | ||||
| wxBillAction.setUserId(user.getId()); | wxBillAction.setUserId(user.getId()); | ||||