Commit 2be23b3a by guojx

查询分组下的门店,即无归属门店

parent 2831134b
...@@ -7,6 +7,8 @@ import com.gic.api.base.commons.JSONResponse; ...@@ -7,6 +7,8 @@ import com.gic.api.base.commons.JSONResponse;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.commons.util.DataApiUtils; import com.gic.commons.util.DataApiUtils;
import com.gic.commons.webapi.reponse.RestResponse; import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.common.utils.AuthWebRequestUtil;
import com.gic.haoban.manage.web.handle.WechatEventTrackingClerkDetailHandle; import com.gic.haoban.manage.web.handle.WechatEventTrackingClerkDetailHandle;
import com.gic.haoban.manage.web.handle.WechatEventTrackingStoreGroupHandle; import com.gic.haoban.manage.web.handle.WechatEventTrackingStoreGroupHandle;
import com.gic.haoban.manage.web.qo.eventtracking.WechatEventTrackingClerkDetailQO; import com.gic.haoban.manage.web.qo.eventtracking.WechatEventTrackingClerkDetailQO;
...@@ -252,7 +254,8 @@ public class EventTrackingController extends NewBaseController { ...@@ -252,7 +254,8 @@ public class EventTrackingController extends NewBaseController {
*/ */
@RequestMapping(value = "get-unaffiliated-store") @RequestMapping(value = "get-unaffiliated-store")
public RestResponse<List<String>> getUnaffiliatedStoreByStoreGroupId(String storeGroupId) { public RestResponse<List<String>> getUnaffiliatedStoreByStoreGroupId(String storeGroupId) {
return RestResponse.successResult(storeAuthUtils.getUnaffiliatedStoreByStoreGroupId(storeGroupId)); WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
return RestResponse.successResult(storeAuthUtils.getPreStoreIdList(storeGroupId, login.getEnterpriseId()));
} }
/** /**
......
...@@ -270,13 +270,6 @@ public class StoreAuthUtils { ...@@ -270,13 +270,6 @@ public class StoreAuthUtils {
return storeIdList; return storeIdList;
} }
public List<String> getUnaffiliatedStoreByStoreGroupId(String storeGroupId) {
String[] queryArr = new String[]{storeGroupId};
List<String> storeIdList = storeService.getStoreIdListByGroupId(queryArr,
getAllStoreStatus().stream().mapToInt(e -> Integer.parseInt(e)).boxed().collect(Collectors.toList()));
return storeIdList;
}
private String getPreStoreGroupId(String preStoreGroupId, String enterpriseId) { private String getPreStoreGroupId(String preStoreGroupId, String enterpriseId) {
if (isAllStoreGroup(preStoreGroupId)) { if (isAllStoreGroup(preStoreGroupId)) {
return initGroupId(enterpriseId); return initGroupId(enterpriseId);
......
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