From a60c3e9dc15f2a43a1ed6d987600a0b2775e802e Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 24 Jun 2019 16:44:49 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7=E8=A7=A3=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/vo/WxMerchantTradeDailyVo.java | 8 ++++++++ .../service/impl/WxMerchantTradeDailyServiceImpl.java | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java index 1b9439691..3007a0094 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java @@ -53,6 +53,14 @@ public class WxMerchantTradeDailyVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") private String merchantName; + public String getbUserName() { + return bUserName; + } + + public void setbUserName(String bUserName) { + this.bUserName = bUserName; + } + @Excel(name = "操作人", width = 20, orderNum = "6") @io.swagger.annotations.ApiModelProperty(value = "b端用户姓名", name = "bUserName") private String bUserName; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index 60e7dc33d..4ae5df1ba 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -185,7 +185,6 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily.setTenantId(wxMerchantTradeDailyVo.getTenantId()); wxMerchantTradeDaily.setMerchantId(wxMerchantTradeDailyVo.getMerchantId()); List list = wxMerchantTradeDailyMapper.findListVoOfMonth(wxMerchantTradeDaily); - list.parallelStream().forEach(t -> t.setMerchantName(null)); String title = "近30天解单数据"; if (!list.isEmpty()) { String merchantName = list.get(0).getMerchantName();