lin 2 лет назад
Родитель
Сommit
a068c064d8
2 измененных файлов: 8 добавлений и 2 удалений
  1. +6
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java
  2. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java

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

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


+ 2
- 1
mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java Просмотреть файл

@@ -435,13 +435,14 @@ public class AsyncTask {
}
@Async
public void importMerchantInit(File file, MallUserInfo user, String importKey,HttpServletRequest request, HttpServletResponse response) {
public void importMerchantInit(boolean isAllNew,File file, MallUserInfo user, String importKey,HttpServletRequest request, HttpServletResponse response) {
// 需要验证
String[] needFields = new String[]{"门店名称", "门店ID", "城市", "详细地址"};
ExcelImportResult<MerchantPoiTNew> datalist = handleImportFile(null,file,MerchantPoiTNew.class,poiImportFields,needFields,new AsyncTask.PoiNewExcelHandler());
if (null == datalist) {
return ;
}
//如果不是覆盖,则查询商户中
//查询所有匹配了poi的
TtMerchantPoi poiQ = new TtMerchantPoi();
poiQ.updateTenantInfo(user);


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