xhxu 2 лет назад
Родитель
Сommit
50c4800751
1 измененных файлов: 7 добавлений и 7 удалений
  1. +7
    -7
      mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java

+ 7
- 7
mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java Просмотреть файл

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


Загрузка…
Отмена
Сохранить