diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 89e598ae3..8035d4984 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -283,6 +283,9 @@ public enum ErrorCode{ * */ BILL_ROUTINE_IS_NOT_FOUND(21000,"账单不存在"), BILL_UPDATE_FAILED(21001,"账单更新失败"), + BILL_OWE_ZERO(21002,"账单欠缴为0"), + BILL_PAY_ERROR(21003,"账单支付错误"), + /** * 商铺 * */ 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 b85030520..147ee368c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -111,6 +111,12 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { @Override public ResultData saveOrUpdate(WxBillDaily record) { + int receivepay = record.getReceivePay().intValue(); + int pay = record.getPay().intValue(); + if(pay>receivepay){ + return new ResultData(ErrorCode.BILL_PAY_ERROR.getCode(),"实收金额不能大于实际应收金额"); + } + MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession"); if (record.getId() == null) { logger.info("新增日常账单"); 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 082723773..5f3d07583 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -93,7 +93,11 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { @Override public ResultData saveOrUpdate(WxBillDeposit record) { - + int receivepay = record.getReceivePay().intValue(); + int pay = record.getPay().intValue(); + if(pay>receivepay){ + return new ResultData(ErrorCode.BILL_PAY_ERROR,"实收金额不能大于实际应收金额"); + } if (record.getId() == null) { logger.info("新增租赁押金账单"); final IdWorker idWorker = IdWorker.get(); 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 92b912354..9ccecd9cf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -111,6 +111,11 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { @Override public ResultData saveOrUpdate(WxBillOther record) { + int receivepay = record.getReceivePay().intValue(); + int pay = record.getPay().intValue(); + if(pay>receivepay){ + return new ResultData(ErrorCode.BILL_PAY_ERROR,"实收金额不能大于实际应收金额"); + } MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession"); if (record.getId() == null) { logger.info("新增其他账单"); 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 526f2ff70..f06f2dc76 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -94,7 +94,11 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe @Override public ResultData saveOrUpdate(WxBillPropertyDeposit record) { - + int receivepay = record.getReceivePay().intValue(); + int pay = record.getPay().intValue(); + if(pay>receivepay){ + return new ResultData(ErrorCode.BILL_PAY_ERROR,"实收金额不能大于实际应收金额"); + } if (record.getId() == null) { logger.info("新增物业押金账单"); final IdWorker idWorker = IdWorker.get(); 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 14ab3ed7a..a939d4387 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -92,6 +92,11 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { @Override public ResultData saveOrUpdate(WxBillProperty record) { + int receivepay = record.getReceivePay().intValue(); + int pay = record.getPay().intValue(); + if(pay>receivepay){ + return new ResultData(ErrorCode.BILL_PAY_ERROR,"实收金额不能大于实际应收金额"); + } if (record.getId() == null) { logger.info("新增物业账单"); final IdWorker idWorker = IdWorker.get(); 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 fd4ecccc6..f15fc8950 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -93,6 +93,11 @@ public class WxBillRentServiceImpl implements WxBillRentService { @Override public ResultData saveOrUpdate(WxBillRent record) { + int receivepay = record.getReceivePay().intValue(); + int pay = record.getPay().intValue(); + if(pay>receivepay){ + return new ResultData(ErrorCode.BILL_PAY_ERROR,"实收金额不能大于实际应收金额"); + } if (record.getId() == null) { logger.info("新增租赁账单"); final IdWorker idWorker = IdWorker.get(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java index 19eb28d40..9e8ac8f44 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java @@ -97,6 +97,11 @@ public class WxPayBillServiceImpl implements WxPayBillService { } //获取账单数据 Map bill = bills.get(0); + Integer owe = (Integer)bill.get("owe"); + if(owe.intValue()<=0){ + logger.info("账单欠缴为0"); + return new ResultData(ErrorCode.BILL_OWE_ZERO); + } //获取支付账户信息 WxPayAccountBill payAccount = wxPayAccountBillMapper.selectByPrimaryKey(appInfo.getPayBillId()); Date currentDate = new Date();