From a068c064d8f01300e491cd9bf3a7a45116c18262 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Tue, 11 Jul 2023 18:46:13 +0800 Subject: [PATCH] fix bug --- .../iformall/controller/basic/TtMerchantPoiController.java | 7 ++++++- .../main/java/com/iformall/controller/mem/AsyncTask.java | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java index bdc10994b..0ba6a03b7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java @@ -299,6 +299,11 @@ public class TtMerchantPoiController extends DouyinBaseController { @SystemControllerLog(description = "poi-初始化商户商户") public void importMerchantInitByPoi(@RequestParam("file") MultipartFile mFile,HttpServletRequest request, HttpServletResponse response) { try { + String isnew = request.getParameter("isnew"); + boolean isNew = false; + if ("1".equals(isnew)) { + isNew = true; + } boolean isSaas = this.isGoodLifeSaas(); if (!isSaas) { throw new MallinkException(Result.ERROR,"当前版本不支持"); @@ -307,7 +312,7 @@ public class TtMerchantPoiController extends DouyinBaseController { String userId = "" + user.getId(); String importKey = Constant.importPoiMerchantPrev + userId; File lFile = handlerImportFile(mFile,importKey,"poiMerchantInit"); - asyncTask.importMerchantInit(lFile, user, importKey,request,response); + asyncTask.importMerchantInit(isNew,lFile, user, importKey,request,response); } } catch (Exception e) { logger.error("importMerchantInitByPoi error.",e); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java index 5f92da0ee..38cd402ed 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -435,13 +435,14 @@ public class AsyncTask { } @Async - public void importMerchantInit(File file, MallUserInfo user, String importKey,HttpServletRequest request, HttpServletResponse response) { + public void importMerchantInit(boolean isAllNew,File file, MallUserInfo user, String importKey,HttpServletRequest request, HttpServletResponse response) { // 需要验证 String[] needFields = new String[]{"门店名称", "门店ID", "城市", "详细地址"}; ExcelImportResult datalist = handleImportFile(null,file,MerchantPoiTNew.class,poiImportFields,needFields,new AsyncTask.PoiNewExcelHandler()); if (null == datalist) { return ; } + //如果不是覆盖,则查询商户中 //查询所有匹配了poi的 TtMerchantPoi poiQ = new TtMerchantPoi(); poiQ.updateTenantInfo(user);