Explorar el Código

fix poi

release_toaliyun_real
lin hace 2 años
padre
commit
929bedb27b
Se han modificado 1 ficheros con 1 adiciones y 6 borrados
  1. +1
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java

+ 1
- 6
mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java Ver fichero

@@ -299,11 +299,6 @@ public class TtMerchantPoiController extends DouyinBaseController {
@SystemControllerLog(description = "poi-初始化商户商户") @SystemControllerLog(description = "poi-初始化商户商户")
public void importMerchantInitByPoi(@RequestParam("file") MultipartFile mFile,HttpServletRequest request, HttpServletResponse response) { public void importMerchantInitByPoi(@RequestParam("file") MultipartFile mFile,HttpServletRequest request, HttpServletResponse response) {
try { try {
String isnew = request.getParameter("isnew");
boolean isNew = false;
if ("1".equals(isnew)) {
isNew = true;
}
boolean isSaas = this.isGoodLifeSaas(); boolean isSaas = this.isGoodLifeSaas();
if (!isSaas) { if (!isSaas) {
throw new MallinkException(Result.ERROR,"当前版本不支持"); throw new MallinkException(Result.ERROR,"当前版本不支持");
@@ -312,7 +307,7 @@ public class TtMerchantPoiController extends DouyinBaseController {
String userId = "" + user.getId(); String userId = "" + user.getId();
String importKey = Constant.importPoiMerchantPrev + userId; String importKey = Constant.importPoiMerchantPrev + userId;
File lFile = handlerImportFile(mFile,importKey,"poiMerchantInit"); File lFile = handlerImportFile(mFile,importKey,"poiMerchantInit");
asyncTask.importMerchantInit(isNew,lFile, user, importKey,request,response);
asyncTask.importMerchantInit(lFile, user, importKey,request,response);
} }
} catch (Exception e) { } catch (Exception e) {
logger.error("importMerchantInitByPoi error.",e); logger.error("importMerchantInitByPoi error.",e);


Cargando…
Cancelar
Guardar