Commit 4817d2a3 by 陶光胜

门店品牌变更

parent 09f1d9d7
......@@ -84,19 +84,20 @@ public interface StoreOpenApiService {
ServiceResponse<String> pageStore(String appId, Integer enterpriseId, Integer regionId, Integer pageNum, Integer pageSize);
/**
* 查询导购详情
* getClerkDetail
* @Title: getClerkDetail
* @Description:
* @author zhiwj
* @Description: 查看导购详情
* @author taogs
* @param appId
* @param enterpriseId
* @param regionId
* @param storeCode
* @param clerkCode
* @param regionId
* @param storeInfoId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.String>
* @throws
*/
ServiceResponse<String> getClerkDetail(String appId, Integer enterpriseId, String storeCode, String clerkCode, Integer regionId);
ServiceResponse<String> getClerkDetail(String appId, Integer enterpriseId, Integer regionId, String storeCode, String clerkCode, Integer storeInfoId);
/**
* addClerk
......
......@@ -441,22 +441,24 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
}
@Override
@GatewayParams(query = {"appId", "enterpriseId", "storeCode", "clerkCode", "regionId"})
public ServiceResponse<String> getClerkDetail(String appId, Integer enterpriseId, String storeCode, String clerkCode, Integer regionId) {
@GatewayParams(query = {"appId", "enterpriseId", "regionId", "storeCode", "clerkCode", "storeInfoId"})
public ServiceResponse<String> getClerkDetail(String appId, Integer enterpriseId, Integer regionId, String storeCode, String clerkCode, Integer storeInfoId) {
//参数校验
ServiceResponse<EnterpriseDTO> enterpriseResult = enterpriseApiService.getEnterpriseById(enterpriseId);
if (!enterpriseResult.isSuccess()) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户ID错误,无此商户");
}
if (StringUtils.isBlank(storeCode)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店code不能为空");
}
if (regionId == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店域不能为空");
}
StoreDTO store = storeService.getStoreByRegionIdAndStoreCode(enterpriseId, regionId, storeCode);
if (store == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店code或者域数据错误,无此门店");
if(storeInfoId == null){
if(regionId == null || StringUtils.isBlank(storeCode)){
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店域或者门店code不能为空");
}
StoreDTO store = storeService.getStoreByRegionIdAndStoreCode(enterpriseId, regionId, storeCode);
if (store == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店code或者域数据错误,无此门店");
}
storeInfoId = store.getStoreInfoId();
storeCode = store.getStoreCode();
regionId = store.getRegionId();
}
if (!hasAuth(appId, enterpriseId, storeCode, regionId)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "没有门店权限");
......@@ -464,7 +466,6 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
if (StringUtils.isBlank(clerkCode)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "导购code不能为空");
}
Integer storeInfoId = store.getStoreInfoId();
TabClerk clerk = this.clerkService.getClerkByCode(enterpriseId, clerkCode, storeInfoId);
if (clerk == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "导购代码错误,无此导购");
......
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