Skip to content

G
gic-store
Commit c822282d by zhiwj
Options

门店新增修改

parent 9db6cc4b
Showing with 45 additions and 26 deletions
gic-store-api/src/main/java/com/gic/store/service/StoreOpenApiService.java
......@@ -47,7 +47,7 @@ public interface StoreOpenApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.String>
* @throws
*/
ServiceResponse<String> addStore(Integer enterpriseId, StoreOpenDTO storeOpenDTO);
ServiceResponse<String> addStore(String appId, Integer enterpriseId, StoreOpenDTO storeOpenDTO);
/**
......@@ -60,7 +60,7 @@ public interface StoreOpenApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.String>
* @throws
*/
ServiceResponse<String> editStore(Integer enterpriseId, StoreOpenDTO storeOpenDTO);
ServiceResponse<String> editStore(String appId, Integer enterpriseId, StoreOpenDTO storeOpenDTO);
/**
* 门店列表接口
......@@ -72,7 +72,7 @@ public interface StoreOpenApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.String>
* @throws
*/
ServiceResponse<String> pageStore(Integer enterpriseId, Integer regionId, Integer pageNum, Integer pageSize);
ServiceResponse<String> pageStore(String appId, Integer enterpriseId, Integer regionId, Integer pageNum, Integer pageSize);
/**
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java
......@@ -263,22 +263,22 @@ public class StoreApiServiceImpl implements StoreApiService {
.append("变更为【").append(newStore.getLongitude()).append(",").append(newStore.getLatitude()).append("】");
}
}
if (!CollectionUtils.isEqualCollection(oldStore.getStoreExtendList(), newStore.getStoreExtendList())) {
for (int i = 0; i < newStore.getStoreExtendList().size(); i++) {
StoreExtendDTO newStoreExtend = newStore.getStoreExtendList().get(i);
if (StringUtils.isNotBlank(newStoreExtend.getValue())) {
Integer fieldType = newStoreExtend.getStoreFieldType();
if (StoreFieldTypeEnum.RADIO.getCode() == fieldType || StoreFieldTypeEnum.CHECK.getCode() == fieldType) {
if (StringUtils.isNotBlank(newStoreExtend.getValue())) {
TabStoreFieldSelect select = storeFieldSelectService.getStoreFieldSelectById(Integer.parseInt(newStoreExtend.getValue()));
sb.append(newStoreExtend.getStoreFieldName()).append("变更为【").append(select.getStoreFieldSelectName()).append("】");
}
} else {
sb.append(newStoreExtend.getStoreFieldName()).append("变更为【").append(newStoreExtend.getValue()).append("】");
}
}
}
}
// if (!CollectionUtils.isEqualCollection(oldStore.getStoreExtendList(), newStore.getStoreExtendList())) {
// for (int i = 0; i < newStore.getStoreExtendList().size(); i++) {
// StoreExtendDTO newStoreExtend = newStore.getStoreExtendList().get(i);
// if (StringUtils.isNotBlank(newStoreExtend.getValue())) {
// Integer fieldType = newStoreExtend.getStoreFieldType();
// if (StoreFieldTypeEnum.RADIO.getCode() == fieldType || StoreFieldTypeEnum.CHECK.getCode() == fieldType) {
// if (StringUtils.isNotBlank(newStoreExtend.getValue())) {
// TabStoreFieldSelect select = storeFieldSelectService.getStoreFieldSelectById(Integer.parseInt(newStoreExtend.getValue()));
// sb.append(newStoreExtend.getStoreFieldName()).append("变更为【").append(select.getStoreFieldSelectName()).append("】");
// }
// } else {
// sb.append(newStoreExtend.getStoreFieldName()).append("变更为【").append(newStoreExtend.getValue()).append("】");
// }
// }
// }
// }
storeLogDTO.setContent(sb.toString());
if (StringUtils.isNotBlank(storeLogDTO.getContent().trim())) {
this.storeLogService.saveStoreLog(storeLogDTO);
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreOpenApiServiceImpl.java
......@@ -119,8 +119,8 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
}
@Override
@GatewayParams(query = {"enterpriseId"}, body = {"storeOpenDTO"})
public ServiceResponse<String> addStore(Integer enterpriseId, StoreOpenDTO storeOpenDTO) {
@GatewayParams(query = {"appId","enterpriseId"}, body = {"storeOpenDTO"})
public ServiceResponse<String> addStore(String appId, Integer enterpriseId, StoreOpenDTO storeOpenDTO) {
LOGGER.info("对外API新增门店参数：{}", JSON.toJSONString(storeOpenDTO));
ServiceResponse<EnterpriseDTO> enterpriseResult = enterpriseApiService.getEnterpriseById(enterpriseId);
if (!enterpriseResult.isSuccess()) {
......@@ -140,6 +140,10 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
if (StringUtils.isBlank(storeOpenDTO.getBrand())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "店招品牌不能为空");
}
// 校验权限
if (!hasAuth(appId, enterpriseId, storeOpenDTO.getStoreCode(), storeOpenDTO.getRegionId())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "没有门店权限");
}
// 校验门店类型
if (storeOpenDTO.getErpType() != null) {
......@@ -283,6 +287,9 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
for (int i = 0; i < fieldList.size(); i++) {
StoreExtendDTO storeExtendDTO = new StoreExtendDTO();
storeExtendDTO.setStoreFieldId(fieldList.get(i).getStoreFieldId());
storeExtendDTO.setStoreFieldType(fieldList.get(i).getStoreFieldType());
storeExtendDTO.setStoreFieldName(fieldList.get(i).getStoreFieldName());
storeExtendDTO.setStoreFieldCode(fieldList.get(i).getStoreFieldCode());
for (JSONObject storeFieldObject : customFieldList) {
if (fieldList.get(i).getStoreFieldName().equals(storeFieldObject.getString("fieldName"))) {
storeExtendDTO.setValue(storeFieldObject.getString("fieldValue"));
......@@ -319,8 +326,8 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
}
@Override
@GatewayParams(query = {"enterpriseId"}, body = {"storeOpenDTO"})
public ServiceResponse<String> editStore(Integer enterpriseId, StoreOpenDTO storeOpenDTO) {
@GatewayParams(query = {"appId", "enterpriseId"}, body = {"storeOpenDTO"})
public ServiceResponse<String> editStore(String appId, Integer enterpriseId, StoreOpenDTO storeOpenDTO) {
ServiceResponse<EnterpriseDTO> enterpriseResult = enterpriseApiService.getEnterpriseById(enterpriseId);
if (!enterpriseResult.isSuccess()) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户ID错误，无此商户");
......@@ -337,12 +344,18 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
} else {
return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店不存在");
}
return this.addStore(enterpriseId, storeOpenDTO);
// 校验权限
if (!hasAuth(appId, enterpriseId, storeOpenDTO.getStoreCode(), storeOpenDTO.getRegionId())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "没有门店权限");
}
return this.addStore(appId, enterpriseId, storeOpenDTO);
}
@Override
@GatewayParams(query = {"enterpriseId", "regionId", "pageNum", "pageSize"})
public ServiceResponse<String> pageStore(Integer enterpriseId, Integer regionId, Integer pageNum, Integer pageSize) {
@GatewayParams(query = {"appId", "enterpriseId", "regionId", "pageNum", "pageSize"})
public ServiceResponse<String> pageStore(String appId, Integer enterpriseId, Integer regionId, Integer pageNum, Integer pageSize) {
if (enterpriseId == null) {
return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户id不能为空");
}
......@@ -352,6 +365,12 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
storeSearchDTO.setEnterpriseId(enterpriseId);
storeSearchDTO.setRegionId(regionId);
// 校验权限
if (!hasAuth(appId, enterpriseId, null, regionId)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "没有门店权限");
}
ServiceResponse<Page<StoreDTO>> serviceResponse = this.storeApiService.listStore(storeSearchDTO, pageNum, pageSize);
if (!serviceResponse.isSuccess()) {
return EnterpriseServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
......
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