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