From 9edc6ade5b1b2227ca23a842b84e1fc1eab6a86b Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 3 Jul 2019 17:02:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxBillAllServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 ef3ba1e53..2230025a9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1033,6 +1033,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { daily.setPayDate(bill.getPayDate()); daily.setReceiveDate(bill.getReceiveDate()); wxBillDailyMapper.updateByPrimaryKey(daily); + addActionImport(daily.getId(), bill.getPayWay(), user); } } else { WxMerchantShop wxMerchantShop = new WxMerchantShop(); @@ -1061,9 +1062,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { daily.setOwe(0L); daily.setIsDel(EnumDelStatus.NOT_DEL.getCode()); wxBillDailyMapper.insertSelective(daily); + addActionImport(daily.getId(), bill.getPayWay(), user); } } - addActionImport(daily.getId(), bill.getPayWay(), user); } else if (billType.equals(EnumBillExcelTemplate.OTHER.getCode())) { WxBillOther otherQuery = new WxBillOther(); otherQuery.setTenantId(tenantId); @@ -1084,6 +1085,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { other.setPayDate(bill.getPayDate()); other.setReceiveDate(bill.getReceiveDate()); wxBillOtherMapper.updateByPrimaryKey(other); + addActionImport(other.getId(), bill.getPayWay(), user); } } else { WxMerchantShop wxMerchantShop = new WxMerchantShop(); @@ -1113,9 +1115,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { other.setOwe(0L); other.setIsDel(EnumDelStatus.NOT_DEL.getCode()); wxBillOtherMapper.insertSelective(other); + addActionImport(other.getId(), bill.getPayWay(), user); } } - addActionImport(other.getId(), bill.getPayWay(), user); } else if (billType.equals(EnumBillExcelTemplate.OTHER_DEPOSIT.getCode())) { WxBillOtherDeposit otherDepositQuery = new WxBillOtherDeposit(); otherDepositQuery.setTenantId(tenantId); @@ -1134,11 +1136,13 @@ public class WxBillAllServiceImpl implements WxBillAllService { otherDeposit.setPayDate(bill.getPayDate()); otherDeposit.setReceiveDate(bill.getReceiveDate()); wxBillOtherDepositMapper.updateByPrimaryKey(otherDeposit); + addActionImport(otherDeposit.getId(), bill.getPayWay(), user); } } else { WxMerchantShop wxMerchantShop = new WxMerchantShop(); wxMerchantShop.setTenantId(tenantId); wxMerchantShop.setMerchantId(bill.getMerchantId()); + otherDepositQuery.setReceiveDate(bill.getReceiveDate()); wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); List select = wxMerchantShopMapper.select(wxMerchantShop); if (!select.isEmpty()) { @@ -1163,9 +1167,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { otherDeposit.setOwe(0L); otherDeposit.setIsDel(EnumDelStatus.NOT_DEL.getCode()); wxBillOtherDepositMapper.insertSelective(otherDeposit); + addActionImport(otherDeposit.getId(), bill.getPayWay(), user); } } - addActionImport(otherDeposit.getId(), bill.getPayWay(), user); } else { logger.error("账单导入失败"); }