Commit 29416d80 by guojuxing

接口名称调整

parent 7e7996f8
......@@ -11,22 +11,11 @@ import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.gic.commons.annotation.HeaderSignIgnore;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.constant.Constants;
import com.gic.enterprise.dto.wm.WmStoreSyncLogDTO;
import com.gic.enterprise.web.vo.wm.WmBranchVO;
import com.gic.weimob.api.dto.WeimobGuiderSynDTO;
import com.gic.weimob.api.dto.WeimobStoreGicInfoDTO;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.*;
import org.redisson.api.RMap;
......@@ -43,17 +32,22 @@ import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.service.UserApiService;
import com.gic.commons.annotation.HeaderSignIgnore;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.GlobalInfo;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.download.utils.ExecutorPoolSingleton;
import com.gic.enterprise.constant.Constants;
import com.gic.enterprise.constant.MallModeEnum;
import com.gic.enterprise.dto.WmStoreDTO;
import com.gic.enterprise.dto.wm.WmStoreSyncLogDTO;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.WmStoreApiService;
import com.gic.enterprise.service.WmStoreSyncLogApiService;
import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.enterprise.web.vo.wm.WeimobStoreClerkLogVO;
import com.gic.enterprise.web.vo.wm.WmBranchVO;
import com.gic.redis.data.util.RedisUtil;
import com.gic.store.dto.*;
import com.gic.store.service.ClerkApiService;
......@@ -61,7 +55,8 @@ import com.gic.store.service.StoreApiService;
import com.gic.store.service.StoreRegionApiService;
import com.gic.weimob.api.dto.WeimobPhysicalStoreDTO;
import com.gic.weimob.api.dto.WeimobStoreAccountDTO;
import com.gic.weimob.api.service.WeimobStoreSiteService;
import com.gic.weimob.api.dto.WeimobStoreGicInfoDTO;
import com.gic.weimob.api.service.WeimobStoreSiteApiService;
/**
* 同步门店to微盟
......@@ -89,7 +84,7 @@ public class WmStoreSyncController {
@Autowired
private WmStoreApiService wmStoreApiService;
@Autowired
private WeimobStoreSiteService weimobStoreSiteService;
private WeimobStoreSiteApiService weimobStoreSiteService;
@Autowired
private StoreApiService storeApiService;
@Autowired
......@@ -577,7 +572,7 @@ public class WmStoreSyncController {
private StoreApiService storeApiService;
private ClerkApiService clerkApiService;
private WmStoreSyncLogApiService wmStoreSyncLogApiService;
private WeimobStoreSiteService weimobStoreSiteService;
private WeimobStoreSiteApiService weimobStoreSiteService;
private Integer enterpriseId;
private List<Map<Integer, String>> data;
......@@ -592,7 +587,7 @@ public class WmStoreSyncController {
public MyTaskOfBranchStore(StoreApiService storeApiService, ClerkApiService clerkApiService,
WmStoreSyncLogApiService wmStoreSyncLogApiService,
WeimobStoreSiteService weimobStoreSiteService, Integer enterpriseId, List<Map<Integer, String>> data,
WeimobStoreSiteApiService weimobStoreSiteService, Integer enterpriseId, List<Map<Integer, String>> data,
Integer headerStoreId, StoreRegionApiService storeRegionApiService, Integer wmMallStoreId,
boolean isBranch, boolean oneAndOne) {
this.storeApiService = storeApiService;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment