| @@ -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(); | |||
| } | |||
| @@ -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(); | |||
| } | |||
| } | |||
| @@ -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(); | |||
| } | |||
| } | |||
| @@ -89,9 +89,6 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { | |||
| @Override | |||
| public void exportData(HttpServletRequest request, HttpServletResponse response, WxCreditHistory wxCreditHistory) { | |||
| List<WxCreditHistoryVo> 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<WxCreditHistoryVo> listAsPageMore(WxCreditHistory record, Integer pageIndex, Integer pageSize) { | |||
| PageHelper.startPage(pageIndex, pageSize); | |||
| List<WxCreditHistoryVo> wxCreditHistoryVoList = wxCreditHistoryMapper.findListMore(record); | |||
| if (wxCreditHistoryVoList == null || wxCreditHistoryVoList.size() == 0) { | |||
| return new PageInfo<>(wxCreditHistoryVoList); | |||
| } | |||
| supplyCreditInfo(wxCreditHistoryVoList); | |||
| return new PageInfo<>(wxCreditHistoryVoList); | |||
| } | |||
| @@ -136,7 +136,7 @@ | |||
| <select id="findListMore" parameterType="com.iformall.domain.po.WxCreditHistory" resultType="com.iformall.domain.vo.WxCreditHistoryVo"> | |||
| SELECT | |||
| credit.id creditId, | |||
| basic.nick_name name, | |||
| case when basic.nick_name is null then basic.name else basic.nick_name end name, | |||
| basic.phone phone, | |||
| basic.sex sex, | |||
| credit.tenant_id tenantId, | |||
| @@ -150,7 +150,11 @@ | |||
| credit.operator_id operatorId, | |||
| merchant.NAME merchantName, | |||
| credit.merchant_id merchantId, | |||
| credit.ticket_number ticketNumber | |||
| credit.ticket_number ticketNumber, | |||
| case when credit.operator_type=4 then (select name from mall_user_info where id=credit.operator_id) | |||
| when credit.operator_type=3 then (select name from wx_merchant_b_user where id=credit.operator_id) | |||
| when credit.operator_type=1 then (select nick_name from wx_c_user where id=credit.operator_id) | |||
| else '' end operator | |||
| FROM | |||
| wx_c_user_basic_info basic | |||
| INNER JOIN wx_credit_history credit ON basic.id = credit.c_user_id | |||