|
|
|
@@ -254,13 +254,13 @@ public class TtMerchantPoiController extends DouyinBaseController { |
|
|
|
//@SystemControllerLog(description = "poi-来客模版补齐地理位置信息") |
|
|
|
public void addLocationInfo(@RequestParam("poiFile") MultipartFile mFile,HttpServletRequest request, HttpServletResponse response) { |
|
|
|
try { |
|
|
|
boolean isSaas = this.isGoodLifeSaas(); |
|
|
|
if (!isSaas) { |
|
|
|
//return addLocationInfo(mFile,false); |
|
|
|
throw new MallinkException(Result.ERROR,"当前版本无需补齐地理位置信息"); |
|
|
|
}else { |
|
|
|
// boolean isSaas = this.isGoodLifeSaas(); |
|
|
|
// if (!isSaas) { |
|
|
|
// //return addLocationInfo(mFile,false); |
|
|
|
// throw new MallinkException(Result.ERROR,"当前版本无需补齐地理位置信息"); |
|
|
|
// }else { |
|
|
|
addLocationInfo(mFile,true,"1bdc087fc6f72820dc5c848a033de7f9",request,response); |
|
|
|
} |
|
|
|
// } |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("addLocationInfo error.",e); |
|
|
|
throw new MallinkException(Result.ERROR,e.getMessage()); |
|
|
|
@@ -273,7 +273,7 @@ public class TtMerchantPoiController extends DouyinBaseController { |
|
|
|
throw new MallinkException(Result.ERROR, "上传文件不能为空"); |
|
|
|
} |
|
|
|
//得到当前用户ID |
|
|
|
final MallUserInfo user = getUser(); |
|
|
|
// final MallUserInfo user = getUser(); |
|
|
|
|
|
|
|
String fpath = fmUploadDir; |
|
|
|
File targetFile = new File(fpath); |
|
|
|
|