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 0f0efebda..cb29bbb78 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java @@ -278,12 +278,12 @@ public class TtMerchantPoiController extends DouyinBaseController { //得到当前用户ID final MallUserInfo user = getUser(); String userId = "" + user.getId(); - String importKey = Constant.importPoiPrev + userId; - File lFile = handlerImportFile(mFile,importKey,"poi"); + //String importKey = Constant.importPoiPrev + userId; + File lFile = handlerImportFile(mFile,null,"poi"); if (isSaas) { - asyncTask.importExcelPoiDataForNew(lFile, user, importKey,request,response); + asyncTask.importExcelPoiDataForNew(lFile, user, null,request,response); }else { - asyncTask.importExcelPoiData(lFile, user, importKey,request,response); + asyncTask.importExcelPoiData(lFile, user, null,request,response); } } catch (Exception e) { logger.error("allTreeList 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 a4a65884a..0e0aa7997 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -290,12 +290,12 @@ public class AsyncTask { return datalist; } - @Async + //@Async public void importExcelPoiData(File file, MallUserInfo user, String importKey,HttpServletRequest request, HttpServletResponse response) { String[] importFields = new String[]{"服务商POI_ID", "POI名称", "省份", "城市", "地址", "经度", "纬度", "高德ID(非必填)", "已匹配POI_ID", "已匹配POI名称", "已匹配POI省份", "已匹配POI城市", "已匹配POI地址", "未匹配原因", "其他信息","POI导入结果"}; String[] needFields = new String[]{"服务商POI_ID","已匹配POI_ID"}; - ExcelImportResult datalist = handleImportFile(importKey,file,MerchantPoiT.class,importFields,needFields,new AsyncTask.PoiExcelHandler()); + ExcelImportResult datalist = handleImportFile(null,file,MerchantPoiT.class,importFields,needFields,new AsyncTask.PoiExcelHandler()); if (null == datalist) { return; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 6b11154d4..e5801e65c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -2275,7 +2275,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { buser.setName("管理员"); buser.setPhone(phone); buser.setUserPwd("123456Abc"); - buser.setIsAdmin(merchant.getIsAdmin()); + buser.setIsAdmin(EnumYesOrNo.YES.getCode()); users.add(buser); merchant.setUsers(users); this.updateMerchantAdmin(merchant) ;