| @@ -985,7 +985,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| rent.setPayDate(bill.getPayDate()); | |||
| rent.setReceiveDate(bill.getReceiveDate()); | |||
| wxBillRentMapper.updateByPrimaryKey(rent); | |||
| addActionImport(rent.getId(), bill.getPayWay(), bill.getPayDate(), user); | |||
| addActionImport(rent.getId(), bill.getPayWay(), bill.getPayDate(), user, bill.getPayStr()); | |||
| } | |||
| } else if (billType.equals(EnumBillExcelTemplate.SHOP_PROPERTY.getCode()) || billType.equals(EnumBillExcelTemplate.POINT_PROPERTY.getCode())) { | |||
| WxBillProperty propertyQuery = new WxBillProperty(); | |||
| @@ -1010,7 +1010,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| property.setPayDate(bill.getPayDate()); | |||
| property.setReceiveDate(bill.getReceiveDate()); | |||
| wxBillPropertyMapper.updateByPrimaryKey(property); | |||
| addActionImport(property.getId(), bill.getPayWay(), bill.getPayDate(), user); | |||
| addActionImport(property.getId(), bill.getPayWay(), bill.getPayDate(), user, pay); | |||
| } | |||
| } else if (billType.equals(EnumBillExcelTemplate.DAILY.getCode())) { | |||
| WxBillDaily dailyQuery = new WxBillDaily(); | |||
| @@ -1040,7 +1040,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| daily.setPayDate(bill.getPayDate()); | |||
| daily.setReceiveDate(bill.getReceiveDate()); | |||
| wxBillDailyMapper.updateByPrimaryKey(daily); | |||
| addActionImport(daily.getId(), bill.getPayWay(), bill.getPayDate(), user); | |||
| addActionImport(daily.getId(), bill.getPayWay(), bill.getPayDate(), user, pay); | |||
| } | |||
| } else { | |||
| WxMerchantShop wxMerchantShop = new WxMerchantShop(); | |||
| @@ -1071,7 +1071,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| daily.setStarttime(bill.getStarttime()); | |||
| daily.setEndtime(bill.getEndtime()); | |||
| wxBillDailyMapper.insertSelective(daily); | |||
| addActionImport(daily.getId(), bill.getPayWay(), bill.getPayDate(), user); | |||
| addActionImport(daily.getId(), bill.getPayWay(), bill.getPayDate(), user, pay); | |||
| } | |||
| } | |||
| } else if (billType.equals(EnumBillExcelTemplate.OTHER.getCode())) { | |||
| @@ -1095,7 +1095,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| other.setPayDate(bill.getPayDate()); | |||
| other.setReceiveDate(bill.getReceiveDate()); | |||
| wxBillOtherMapper.updateByPrimaryKey(other); | |||
| addActionImport(other.getId(), bill.getPayWay(), bill.getPayDate(), user); | |||
| addActionImport(other.getId(), bill.getPayWay(), bill.getPayDate(), user, pay); | |||
| } | |||
| } else { | |||
| WxMerchantShop wxMerchantShop = new WxMerchantShop(); | |||
| @@ -1127,7 +1127,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| other.setStarttime(bill.getStarttime()); | |||
| other.setEndtime(bill.getEndtime()); | |||
| wxBillOtherMapper.insertSelective(other); | |||
| addActionImport(other.getId(), bill.getPayWay(), bill.getPayDate(), user); | |||
| addActionImport(other.getId(), bill.getPayWay(), bill.getPayDate(), user, pay); | |||
| } | |||
| } | |||
| } else if (billType.equals(EnumBillExcelTemplate.OTHER_DEPOSIT.getCode())) { | |||
| @@ -1149,7 +1149,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| otherDeposit.setPayDate(bill.getPayDate()); | |||
| otherDeposit.setReceiveDate(bill.getReceiveDate()); | |||
| wxBillOtherDepositMapper.updateByPrimaryKey(otherDeposit); | |||
| addActionImport(otherDeposit.getId(), bill.getPayWay(), bill.getPayDate(), user); | |||
| addActionImport(otherDeposit.getId(), bill.getPayWay(), bill.getPayDate(), user, pay); | |||
| } | |||
| } else { | |||
| WxMerchantShop wxMerchantShop = new WxMerchantShop(); | |||
| @@ -1182,7 +1182,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| otherDeposit.setStarttime(bill.getStarttime()); | |||
| otherDeposit.setEndtime(bill.getEndtime()); | |||
| wxBillOtherDepositMapper.insertSelective(otherDeposit); | |||
| addActionImport(otherDeposit.getId(), bill.getPayWay(), bill.getPayDate(), user); | |||
| addActionImport(otherDeposit.getId(), bill.getPayWay(), bill.getPayDate(), user, pay); | |||
| } | |||
| } | |||
| } else { | |||
| @@ -1193,11 +1193,11 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| stringRedisTemplate.expire(importKey, 10, TimeUnit.SECONDS); | |||
| } | |||
| public void addActionImport(Long billId, String payWay, Date payDate, MallUserInfo user) { | |||
| public void addActionImport(Long billId, String payWay, Date payDate, MallUserInfo user, String pay) { | |||
| WxBillAction wxBillAction = new WxBillAction(); | |||
| wxBillAction.setBillId(billId); | |||
| String details = StringUtils.isEmpty(payWay) ? "其他缴费" : payWay + "缴费"; | |||
| wxBillAction.setDetails(details); | |||
| wxBillAction.setDetails(details + pay + "元"); | |||
| wxBillAction.setAction(EnumBillAction.IMPORT_PAY.getCode()); | |||
| wxBillAction.setPayDate(payDate); | |||
| wxBillActionService.modifyBill(wxBillAction, user); | |||