|
|
|
@@ -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); |
|
|
|
|