From 514efb7673b13d925e89b50c2da1420ff6605a45 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 3 Jul 2019 16:29:16 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=97=A5=E5=B8=B8=E3=80=81=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E5=8F=8A=E5=85=B6=E4=BB=96=E6=8A=BC=E9=87=91][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E5=88=9B=E5=BB=BA=E6=97=B6=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E8=B4=A6=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/common/ErrorCode.java | 2 +- .../iformall/service/impl/WxBillDailyServiceImpl.java | 10 ++++++++++ .../service/impl/WxBillOtherDepositServiceImpl.java | 11 +++++++++++ .../iformall/service/impl/WxBillOtherServiceImpl.java | 9 +++++++++ 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 6eaac7b4d..29980d013 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -356,7 +356,7 @@ public enum ErrorCode{ BILL_UPDATE_FAILED(21001,"账单更新失败"), BILL_OWE_ZERO(21002,"账单欠缴为0"), BILL_PAY_ERROR(21003,"账单支付错误"), - + BILL_IS_FOUND(21004, "创建的账单已存在"), /** * 商铺 * */ 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 afbadea63..45cfbd4e0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -129,6 +129,16 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { Date date = new Date(); if (record.getId() == null) { logger.info("新增日常账单"); + WxBillDaily dailyQuery = new WxBillDaily(); + dailyQuery.setType(record.getType()); + dailyQuery.setTenantId(record.getTenantId()); + dailyQuery.setMerchantId(record.getMerchantId()); + dailyQuery.setReceiveDate(record.getReceiveDate()); + dailyQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); + WxBillDaily daily = wxBillDailyMapper.selectOne(dailyQuery); + if (daily != null) { + return new ResultData(ErrorCode.BILL_IS_FOUND); + } final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); record.setStatus(record.getReceiveDate().after(date)?EnumBillDailyStatus.WAIT_PAY.getCode():EnumBillDailyStatus.NOT_PAID.getCode()); 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 ec15b9501..96205c637 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -121,6 +121,17 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService Date date = new Date(); if (record.getId() == null) { logger.info("新增其他账单"); + + WxBillOtherDeposit otherDepositQuery = new WxBillOtherDeposit(); + otherDepositQuery.setTenantId(record.getTenantId()); + otherDepositQuery.setMerchantId(record.getMerchantId()); + otherDepositQuery.setReceiveDate(record.getReceiveDate()); + otherDepositQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); + WxBillOtherDeposit otherDeposit = wxBillOtherDepositMapper.selectOne(otherDepositQuery); + if (otherDeposit != null) { + return new ResultData(ErrorCode.BILL_IS_FOUND); + } + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); record.setStatus(EnumBillDailyStatus.WAIT_PAY.getCode()); 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 d8f1e56e4..aed7236d3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -123,6 +123,15 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { Date date = new Date(); if (record.getId() == null) { logger.info("新增其他账单"); + WxBillOther otherQuery = new WxBillOther(); + otherQuery.setTenantId(record.getTenantId()); + otherQuery.setMerchantId(record.getMerchantId()); + otherQuery.setReceiveDate(record.getReceiveDate()); + otherQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); + WxBillOther other = wxBillOtherMapper.selectOne(otherQuery); + if (other != null) { + return new ResultData(ErrorCode.BILL_IS_FOUND); + } final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); record.setStatus(record.getReceiveDate().after(date)?EnumBillDailyStatus.WAIT_PAY.getCode():EnumBillDailyStatus.NOT_PAID.getCode());