From d92bca4a35be94bf684b7fedb63ae4c0257fd2a1 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 10 Oct 2019 11:25:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E6=89=8B=E7=BB=AD?= =?UTF-8?q?=E8=B4=B9][=E5=BC=80=E5=8F=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxBillPropertyServiceImpl.java | 28 +++++++++---------- .../service/impl/WxBillRentServiceImpl.java | 28 +++++++++---------- 2 files changed, 27 insertions(+), 29 deletions(-) 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(); } } From 2202b1a9d5ee0539331e64da096b9b3458c4692e Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 10 Oct 2019 11:30:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[=E7=A7=AF=E5=88=86=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E8=AE=B0=E5=BD=95][=E4=BF=AE=E6=94=B9][=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BC=98=E5=8C=96]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxCreditHistoryServiceImpl.java | 7 ------- .../src/main/resources/mapper/WxCreditHistoryMapper.xml | 6 +++++- 2 files changed, 5 insertions(+), 8 deletions(-) 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..a974c2113 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -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 From 6e2a75460167545e0e122fa5dde996d820929ace Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 10 Oct 2019 11:41:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[=E7=A7=AF=E5=88=86=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E8=AE=B0=E5=BD=95][=E4=BF=AE=E6=94=B9][=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BC=98=E5=8C=96]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCreditHistoryMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index a974c2113..a4f5210fa 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -136,7 +136,7 @@