| @@ -283,6 +283,9 @@ public enum ErrorCode{ | |||||
| * */ | * */ | ||||
| BILL_ROUTINE_IS_NOT_FOUND(21000,"账单不存在"), | BILL_ROUTINE_IS_NOT_FOUND(21000,"账单不存在"), | ||||
| BILL_UPDATE_FAILED(21001,"账单更新失败"), | BILL_UPDATE_FAILED(21001,"账单更新失败"), | ||||
| BILL_OWE_ZERO(21002,"账单欠缴为0"), | |||||
| BILL_PAY_ERROR(21003,"账单支付错误"), | |||||
| /** | /** | ||||
| * 商铺 | * 商铺 | ||||
| * */ | * */ | ||||
| @@ -111,6 +111,12 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { | |||||
| @Override | @Override | ||||
| public ResultData saveOrUpdate(WxBillDaily record) { | 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"); | MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession"); | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| logger.info("新增日常账单"); | logger.info("新增日常账单"); | ||||
| @@ -93,7 +93,11 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { | |||||
| @Override | @Override | ||||
| public ResultData saveOrUpdate(WxBillDeposit record) { | 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) { | if (record.getId() == null) { | ||||
| logger.info("新增租赁押金账单"); | logger.info("新增租赁押金账单"); | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| @@ -111,6 +111,11 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { | |||||
| @Override | @Override | ||||
| public ResultData saveOrUpdate(WxBillOther record) { | 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"); | MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession"); | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| logger.info("新增其他账单"); | logger.info("新增其他账单"); | ||||
| @@ -94,7 +94,11 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe | |||||
| @Override | @Override | ||||
| public ResultData saveOrUpdate(WxBillPropertyDeposit record) { | 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) { | if (record.getId() == null) { | ||||
| logger.info("新增物业押金账单"); | logger.info("新增物业押金账单"); | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| @@ -92,6 +92,11 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||||
| @Override | @Override | ||||
| public ResultData saveOrUpdate(WxBillProperty record) { | 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) { | if (record.getId() == null) { | ||||
| logger.info("新增物业账单"); | logger.info("新增物业账单"); | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| @@ -93,6 +93,11 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| @Override | @Override | ||||
| public ResultData saveOrUpdate(WxBillRent record) { | 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) { | if (record.getId() == null) { | ||||
| logger.info("新增租赁账单"); | logger.info("新增租赁账单"); | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| @@ -97,6 +97,11 @@ public class WxPayBillServiceImpl implements WxPayBillService { | |||||
| } | } | ||||
| //获取账单数据 | //获取账单数据 | ||||
| Map<String, Object> bill = bills.get(0); | Map<String, Object> 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()); | WxPayAccountBill payAccount = wxPayAccountBillMapper.selectByPrimaryKey(appInfo.getPayBillId()); | ||||
| Date currentDate = new Date(); | Date currentDate = new Date(); | ||||