diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 8bd39fc07..c42c03170 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -349,6 +349,7 @@ public class WxRentContractController extends BaseController { WxPayAccountBill payAccountBillNew = payAccountBillService.getByTenantId(tenantId); payAccountBillNew.setBankAccountName(payAccountBill.getBankAccountName()); payAccountBillNew.setBankCardId(payAccountBill.getBankCardId()); + payAccountBillNew.setServiceChargeRate(payAccountBill.getServiceChargeRate()); payAccountBillService.saveOrUpdate(payAccountBillNew); return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 1e15422b1..18385c9b3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -311,26 +311,24 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { @Override public ResultData updateLatePayMoney(WxBillProperty record, MallUserInfo user) { + final IdWorker idWorker = IdWorker.get(); + WxBillAction billAction = new WxBillAction(); + if(record.getLatePayMoneyUpdate() != null) { record.setLatePayPrice(Long.parseLong(record.getLatePayMoneyUpdate()) * 100); + + billAction.setId(idWorker.nextId()); + billAction.setCreatetime(new Date()); + billAction.setUserName("系统端"); + billAction.setAction(EnumBillAction.UPDATE_LATE_PAY_MONEY.getCode()); + billAction.setBillId(record.getId()); + billAction.setDetails(record.getLatePayMoneyBefore()+"元变更为" +record.getLatePayMoneyUpdate()+"元"); + billAction.setUpdatetime(new Date()); + wxBillActionMapper.insert(billAction); } if(record.getServiceChargePay() != null) { record.setServiceChargePay(record.getServiceChargePay() * 100); - } - wxBillPropertyMapper.updateById(record); - final IdWorker idWorker = IdWorker.get(); - WxBillAction billAction = new WxBillAction(); - billAction.setId(idWorker.nextId()); - billAction.setCreatetime(new Date()); - billAction.setUserName("系统端"); - billAction.setAction(EnumBillAction.UPDATE_LATE_PAY_MONEY.getCode()); - billAction.setBillId(record.getId()); - billAction.setDetails(record.getLatePayMoneyBefore()+"元变更为" +record.getLatePayMoneyUpdate()+"元"); - billAction.setUpdatetime(new Date()); - wxBillActionMapper.insert(billAction); - - if(record.getServiceChargePay() != null) { billAction = new WxBillAction(); billAction.setId(idWorker.nextId()); billAction.setCreatetime(new Date()); @@ -341,7 +339,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { billAction.setUpdatetime(new Date()); wxBillActionMapper.insert(billAction); } - + wxBillPropertyMapper.updateById(record); return new ResultData(); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 13b8067af..bc6336a02 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -425,26 +425,24 @@ public class WxBillRentServiceImpl implements WxBillRentService { @Override public ResultData updateLatePayMoney(WxBillRent record, MallUserInfo user) { + final IdWorker idWorker = IdWorker.get(); + WxBillAction billAction = new WxBillAction(); + if(record.getLatePayMoneyUpdate() != null) { record.setLatePayPrice(Long.parseLong(record.getLatePayMoneyUpdate()) * 100); + + billAction.setId(idWorker.nextId()); + billAction.setCreatetime(new Date()); + billAction.setUserName("系统端"); + billAction.setAction(EnumBillAction.UPDATE_LATE_PAY_MONEY.getCode()); + billAction.setBillId(record.getId()); + billAction.setDetails(record.getLatePayMoneyBefore()+"元变更为" +record.getLatePayMoneyUpdate()+"元"); + billAction.setUpdatetime(new Date()); + wxBillActionMapper.insert(billAction); } if(record.getServiceChargePay() != null) { record.setServiceChargePay(record.getServiceChargePay() * 100); - } - wxBillRentMapper.updateById(record); - final IdWorker idWorker = IdWorker.get(); - WxBillAction billAction = new WxBillAction(); - billAction.setId(idWorker.nextId()); - billAction.setCreatetime(new Date()); - billAction.setUserName("系统端"); - billAction.setAction(EnumBillAction.UPDATE_LATE_PAY_MONEY.getCode()); - billAction.setBillId(record.getId()); - billAction.setDetails(record.getLatePayMoneyBefore()+"元变更为" +record.getLatePayMoneyUpdate()+"元"); - billAction.setUpdatetime(new Date()); - wxBillActionMapper.insert(billAction); - - if(record.getServiceChargePay() != null) { billAction = new WxBillAction(); billAction.setId(idWorker.nextId()); billAction.setCreatetime(new Date()); @@ -455,6 +453,8 @@ public class WxBillRentServiceImpl implements WxBillRentService { billAction.setUpdatetime(new Date()); wxBillActionMapper.insert(billAction); } + + wxBillRentMapper.updateById(record); return new ResultData(); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 8a08f83f5..32081e12a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -89,9 +89,6 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { @Override public void exportData(HttpServletRequest request, HttpServletResponse response, WxCreditHistory wxCreditHistory) { List wxCreditHistoryVoList = wxCreditHistoryMapper.findListMore(wxCreditHistory); - if (!wxCreditHistoryVoList.isEmpty()) { - supplyCreditInfo(wxCreditHistoryVoList); - } excelService.exportExcel(wxCreditHistoryVoList, null, "积分变更记录", WxCreditHistoryVo.class, "积分变更记录.xlsx", response, false); } @@ -119,10 +116,6 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { public PageInfo listAsPageMore(WxCreditHistory record, Integer pageIndex, Integer pageSize) { PageHelper.startPage(pageIndex, pageSize); List wxCreditHistoryVoList = wxCreditHistoryMapper.findListMore(record); - if (wxCreditHistoryVoList == null || wxCreditHistoryVoList.size() == 0) { - return new PageInfo<>(wxCreditHistoryVoList); - } - supplyCreditInfo(wxCreditHistoryVoList); return new PageInfo<>(wxCreditHistoryVoList); } diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index b446ba519..a4f5210fa 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -136,7 +136,7 @@