Commit 2fb7955b by 陶光胜

门店修改

parent 65456c42
......@@ -3,6 +3,7 @@ package com.gic.plug.web.controller;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.plug.web.vo.StoreRegionVO;
import com.gic.plug.web.vo.StoreVO;
import com.gic.store.constant.StoreESFieldsEnum;
......@@ -32,7 +33,7 @@ public class StoreController {
@RequestMapping("/list-store-region")
public RestResponse listStoreRegion(String search) {
Integer enterpriseId = 1111;
Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
ServiceResponse<List<StoreRegionDTO>> serviceResponse = storeRegionApiService.listStoreRegion(enterpriseId, search);
if (serviceResponse.isSuccess()) {
List<StoreRegionDTO> result = serviceResponse.getResult();
......@@ -44,7 +45,7 @@ public class StoreController {
@RequestMapping("/list-part-store")
public RestResponse listPartStore(Integer storeGroupId, String search) {
Integer enterpriseId = 1111;
Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
storeSearchDTO.setEnterpriseId(enterpriseId);
storeSearchDTO.setStoreGroupId(storeGroupId);
......
package com.gic.plug.web.controller;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.store.constant.StoreGroupConstant;
import com.gic.store.dto.StoreGroupDTO;
import com.gic.store.service.StoreGroupApiService;
......@@ -28,7 +29,7 @@ public class StoreGroupController {
@RequestMapping("/list")
public RestResponse listStoreGroup() {
StoreGroupDTO dto = new StoreGroupDTO();
dto.setEnterpriseId(StoreGroupConstant.TEST_ENTERPRISE_ID);
dto.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
List<StoreGroupDTO> list = storeGroupApiService.listStoreGroup(dto).getResult();
return RestResponse.success(ChangeListToTree.changeListToTreeNotIncludeAllStore(StoreGroupConstant.ALL_STORE_LEVEL, list));
}
......
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