From 04a94cb5ffa881dcb13257a175877f4d5567ddeb Mon Sep 17 00:00:00 2001 From: Burce Date: Thu, 24 Oct 2019 18:58:01 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=9B=E5=95=86]adjust?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/invest/InvestBaseController.java | 5 +++++ .../src/main/java/com/iformall/utils/UrlCheck.java | 3 ++- .../iformall/service/invest/impl/InvestBizServiceImpl.java | 7 ++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java index d5212b078..ee2e2ac17 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java @@ -3,6 +3,7 @@ package com.iformall.controller.invest; import com.alibaba.fastjson.JSON; import com.iformall.common.ErrorCode; import com.iformall.common.InvestResultData; +import com.iformall.common.Result; import com.iformall.controller.base.BaseController; import com.iformall.domain.vo.invest.InvestUserContext; import com.iformall.enums.*; @@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.InitBinder; import java.beans.PropertyEditor; import java.beans.PropertyEditorSupport; +import java.util.Objects; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Function; @@ -41,6 +43,9 @@ public class InvestBaseController extends BaseController { return new InvestResultData(r); } catch (MallinkException e) { log.error("execute error", e); + if (Objects.equals(Result.SUCCESS, e.getErrorCode())) { + return new InvestResultData(); + } return new InvestResultData(e.getErrorCode(), e.getMessage()); } catch (NullPointerException e) { ErrorCode errorCode = ErrorCode.SYS_NULLPOINTER_ERROR ; diff --git a/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java b/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java index 219410d54..ec8380075 100644 --- a/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java +++ b/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java @@ -20,7 +20,8 @@ public class UrlCheck { || url.contains("pvlog") || url.contains("/wxBillDaily/importTemplate") || url.contains("/kwMeter/import") - || url.contains("/wxImportTemplate/importTemplate"); + || url.contains("/wxImportTemplate/importTemplate") + || url.contains("/invest/customer/importCustomer"); } } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index af8cfef0a..19665f8c9 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -227,7 +227,6 @@ public class InvestBizServiceImpl implements InvestBizService { } doImport(lFile, tenantId, importKey); - throw new MallinkException(Result.SUCCESS, "模板正在导入"); } private void doImport(File file, String tenantId, String importKey) { @@ -831,10 +830,12 @@ public class InvestBizServiceImpl implements InvestBizService { Map usersMap = getMap(userInfoService.getByIds(getIds(recordList, InvestOperateRecordEntity::getOperator)), MallUserInfo::getId); //品牌信息 - Map brandMap = getBrandMap(); + List brands = brandService.listAsPage(null, 1, Integer.MAX_VALUE).getList(); + Map brandMap = getMap(brands, WxBrand::getId); //业态信息 - Map businesseMap = getBusinessMap(); + List businesses = businessService.listAsPage(null, 1, Integer.MAX_VALUE).getList(); + Map businesseMap = getMap(businesses, WxBusiness::getId); List resultList = new ArrayList<>(); for (InvestOperateRecordEntity recordEntity : recordList) {