From 2202b1a9d5ee0539331e64da096b9b3458c4692e Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 10 Oct 2019 11:30:40 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86=E5=8F=98=E6=9B=B4=E8=AE=B0?= =?UTF-8?q?=E5=BD=95][=E4=BF=AE=E6=94=B9][=E5=AF=BC=E5=87=BA=E6=95=B0?= =?UTF-8?q?=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