| @@ -1010,7 +1010,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| property.setPayDate(bill.getPayDate()); | property.setPayDate(bill.getPayDate()); | ||||
| property.setReceiveDate(bill.getReceiveDate()); | property.setReceiveDate(bill.getReceiveDate()); | ||||
| wxBillPropertyMapper.updateByPrimaryKey(property); | wxBillPropertyMapper.updateByPrimaryKey(property); | ||||
| addActionImport(property.getId(), bill.getPayWay(), bill.getPayDate(), user, pay); | |||||
| addActionImport(property.getId(), bill.getPayWay(), bill.getPayDate(), user, bill.getPayStr()); | |||||
| } | } | ||||
| } else if (billType.equals(EnumBillExcelTemplate.DAILY.getCode())) { | } else if (billType.equals(EnumBillExcelTemplate.DAILY.getCode())) { | ||||
| WxBillDaily dailyQuery = new WxBillDaily(); | WxBillDaily dailyQuery = new WxBillDaily(); | ||||
| @@ -1040,7 +1040,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(), bill.getPayDate(), user, pay); | |||||
| addActionImport(daily.getId(), bill.getPayWay(), bill.getPayDate(), user, bill.getPayStr()); | |||||
| } | } | ||||
| } else { | } else { | ||||
| WxMerchantShop wxMerchantShop = new WxMerchantShop(); | WxMerchantShop wxMerchantShop = new WxMerchantShop(); | ||||
| @@ -1071,7 +1071,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| daily.setStarttime(bill.getStarttime()); | daily.setStarttime(bill.getStarttime()); | ||||
| daily.setEndtime(bill.getEndtime()); | daily.setEndtime(bill.getEndtime()); | ||||
| wxBillDailyMapper.insertSelective(daily); | wxBillDailyMapper.insertSelective(daily); | ||||
| addActionImport(daily.getId(), bill.getPayWay(), bill.getPayDate(), user, pay); | |||||
| addActionImport(daily.getId(), bill.getPayWay(), bill.getPayDate(), user, bill.getPayStr()); | |||||
| } | } | ||||
| } | } | ||||
| } else if (billType.equals(EnumBillExcelTemplate.OTHER.getCode())) { | } else if (billType.equals(EnumBillExcelTemplate.OTHER.getCode())) { | ||||
| @@ -1095,7 +1095,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(), bill.getPayDate(), user, pay); | |||||
| addActionImport(other.getId(), bill.getPayWay(), bill.getPayDate(), user, bill.getPayStr()); | |||||
| } | } | ||||
| } else { | } else { | ||||
| WxMerchantShop wxMerchantShop = new WxMerchantShop(); | WxMerchantShop wxMerchantShop = new WxMerchantShop(); | ||||
| @@ -1127,7 +1127,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| other.setStarttime(bill.getStarttime()); | other.setStarttime(bill.getStarttime()); | ||||
| other.setEndtime(bill.getEndtime()); | other.setEndtime(bill.getEndtime()); | ||||
| wxBillOtherMapper.insertSelective(other); | wxBillOtherMapper.insertSelective(other); | ||||
| addActionImport(other.getId(), bill.getPayWay(), bill.getPayDate(), user, pay); | |||||
| addActionImport(other.getId(), bill.getPayWay(), bill.getPayDate(), user, bill.getPayStr()); | |||||
| } | } | ||||
| } | } | ||||
| } else if (billType.equals(EnumBillExcelTemplate.OTHER_DEPOSIT.getCode())) { | } else if (billType.equals(EnumBillExcelTemplate.OTHER_DEPOSIT.getCode())) { | ||||
| @@ -1149,7 +1149,7 @@ 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(), bill.getPayDate(), user, pay); | |||||
| addActionImport(otherDeposit.getId(), bill.getPayWay(), bill.getPayDate(), user, bill.getPayStr()); | |||||
| } | } | ||||
| } else { | } else { | ||||
| WxMerchantShop wxMerchantShop = new WxMerchantShop(); | WxMerchantShop wxMerchantShop = new WxMerchantShop(); | ||||
| @@ -1182,7 +1182,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| otherDeposit.setStarttime(bill.getStarttime()); | otherDeposit.setStarttime(bill.getStarttime()); | ||||
| otherDeposit.setEndtime(bill.getEndtime()); | otherDeposit.setEndtime(bill.getEndtime()); | ||||
| wxBillOtherDepositMapper.insertSelective(otherDeposit); | wxBillOtherDepositMapper.insertSelective(otherDeposit); | ||||
| addActionImport(otherDeposit.getId(), bill.getPayWay(), bill.getPayDate(), user, pay); | |||||
| addActionImport(otherDeposit.getId(), bill.getPayWay(), bill.getPayDate(), user, bill.getPayStr()); | |||||
| } | } | ||||
| } | } | ||||
| } else { | } else { | ||||