| @@ -1033,6 +1033,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| daily.setPayDate(bill.getPayDate()); | daily.setPayDate(bill.getPayDate()); | ||||
| daily.setReceiveDate(bill.getReceiveDate()); | daily.setReceiveDate(bill.getReceiveDate()); | ||||
| wxBillDailyMapper.updateByPrimaryKey(daily); | wxBillDailyMapper.updateByPrimaryKey(daily); | ||||
| addActionImport(daily.getId(), bill.getPayWay(), user); | |||||
| } | } | ||||
| } else { | } else { | ||||
| WxMerchantShop wxMerchantShop = new WxMerchantShop(); | WxMerchantShop wxMerchantShop = new WxMerchantShop(); | ||||
| @@ -1061,9 +1062,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| daily.setOwe(0L); | daily.setOwe(0L); | ||||
| daily.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | daily.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | ||||
| wxBillDailyMapper.insertSelective(daily); | wxBillDailyMapper.insertSelective(daily); | ||||
| addActionImport(daily.getId(), bill.getPayWay(), user); | |||||
| } | } | ||||
| } | } | ||||
| addActionImport(daily.getId(), bill.getPayWay(), user); | |||||
| } else if (billType.equals(EnumBillExcelTemplate.OTHER.getCode())) { | } else if (billType.equals(EnumBillExcelTemplate.OTHER.getCode())) { | ||||
| WxBillOther otherQuery = new WxBillOther(); | WxBillOther otherQuery = new WxBillOther(); | ||||
| otherQuery.setTenantId(tenantId); | otherQuery.setTenantId(tenantId); | ||||
| @@ -1084,6 +1085,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| other.setPayDate(bill.getPayDate()); | other.setPayDate(bill.getPayDate()); | ||||
| other.setReceiveDate(bill.getReceiveDate()); | other.setReceiveDate(bill.getReceiveDate()); | ||||
| wxBillOtherMapper.updateByPrimaryKey(other); | wxBillOtherMapper.updateByPrimaryKey(other); | ||||
| addActionImport(other.getId(), bill.getPayWay(), user); | |||||
| } | } | ||||
| } else { | } else { | ||||
| WxMerchantShop wxMerchantShop = new WxMerchantShop(); | WxMerchantShop wxMerchantShop = new WxMerchantShop(); | ||||
| @@ -1113,9 +1115,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| other.setOwe(0L); | other.setOwe(0L); | ||||
| other.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | other.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | ||||
| wxBillOtherMapper.insertSelective(other); | wxBillOtherMapper.insertSelective(other); | ||||
| addActionImport(other.getId(), bill.getPayWay(), user); | |||||
| } | } | ||||
| } | } | ||||
| addActionImport(other.getId(), bill.getPayWay(), user); | |||||
| } else if (billType.equals(EnumBillExcelTemplate.OTHER_DEPOSIT.getCode())) { | } else if (billType.equals(EnumBillExcelTemplate.OTHER_DEPOSIT.getCode())) { | ||||
| WxBillOtherDeposit otherDepositQuery = new WxBillOtherDeposit(); | WxBillOtherDeposit otherDepositQuery = new WxBillOtherDeposit(); | ||||
| otherDepositQuery.setTenantId(tenantId); | otherDepositQuery.setTenantId(tenantId); | ||||
| @@ -1134,11 +1136,13 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| otherDeposit.setPayDate(bill.getPayDate()); | otherDeposit.setPayDate(bill.getPayDate()); | ||||
| otherDeposit.setReceiveDate(bill.getReceiveDate()); | otherDeposit.setReceiveDate(bill.getReceiveDate()); | ||||
| wxBillOtherDepositMapper.updateByPrimaryKey(otherDeposit); | wxBillOtherDepositMapper.updateByPrimaryKey(otherDeposit); | ||||
| addActionImport(otherDeposit.getId(), bill.getPayWay(), user); | |||||
| } | } | ||||
| } else { | } else { | ||||
| WxMerchantShop wxMerchantShop = new WxMerchantShop(); | WxMerchantShop wxMerchantShop = new WxMerchantShop(); | ||||
| wxMerchantShop.setTenantId(tenantId); | wxMerchantShop.setTenantId(tenantId); | ||||
| wxMerchantShop.setMerchantId(bill.getMerchantId()); | wxMerchantShop.setMerchantId(bill.getMerchantId()); | ||||
| otherDepositQuery.setReceiveDate(bill.getReceiveDate()); | |||||
| wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | ||||
| List<WxMerchantShop> select = wxMerchantShopMapper.select(wxMerchantShop); | List<WxMerchantShop> select = wxMerchantShopMapper.select(wxMerchantShop); | ||||
| if (!select.isEmpty()) { | if (!select.isEmpty()) { | ||||
| @@ -1163,9 +1167,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| otherDeposit.setOwe(0L); | otherDeposit.setOwe(0L); | ||||
| otherDeposit.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | otherDeposit.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | ||||
| wxBillOtherDepositMapper.insertSelective(otherDeposit); | wxBillOtherDepositMapper.insertSelective(otherDeposit); | ||||
| addActionImport(otherDeposit.getId(), bill.getPayWay(), user); | |||||
| } | } | ||||
| } | } | ||||
| addActionImport(otherDeposit.getId(), bill.getPayWay(), user); | |||||
| } else { | } else { | ||||
| logger.error("账单导入失败"); | logger.error("账单导入失败"); | ||||
| } | } | ||||