门店品牌变更

gic-store-api/src/main/java/com/gic/store/dto/open/StoreOpenDTO.java

@@ -42,7 +42,7 @@ public class StoreOpenDTO implements Serializable {
     /**
      * 门店类型
      */
-    private Integer erpType;
+    private Integer storeType;
     /**
      * erp门店状态
      */
@@ -251,12 +251,12 @@ public class StoreOpenDTO implements Serializable {
         this.county = county;
     }
 
-    public Integer getErpType() {
-        return erpType;
+    public Integer getStoreType() {
+        return storeType;
     }
 
-    public void setErpType(Integer erpType) {
-        this.erpType = erpType;
+    public void setStoreType(Integer storeType) {
+        this.storeType = storeType;
     }
 
     public Integer getStoreInfoId() {
@@ -277,7 +277,7 @@ public class StoreOpenDTO implements Serializable {
                 ", regionId=" + regionId +
                 ", storeInfoId=" + storeInfoId +
                 ", photos='" + photos + '\'' +
-                ", erpType=" + erpType +
+                ", storeType=" + storeType +
                 ", erpStatus=" + erpStatus +
                 ", conactsPhone='" + conactsPhone + '\'' +
                 ", businessTime='" + businessTime + '\'' +

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreOpenApiServiceImpl.java

@@ -151,8 +151,10 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
         if (StringUtils.isBlank(storeOpenDTO.getStoreName())) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店名称不能为空");
         }
-        if(storeOpenDTO.getRegionId() == null || StringUtils.isBlank(storeOpenDTO.getStoreCode())){
-            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店域或者门店code不能为空");
+        if(storeOpenDTO.getStoreInfoId() == null){
+            if(storeOpenDTO.getRegionId() == null || StringUtils.isBlank(storeOpenDTO.getStoreCode())){
+                return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店域或者门店code不能为空");
+            }
         }
         if (storeOpenDTO.getStoreBrandId() == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "店招品牌不能为空");
@@ -162,7 +164,7 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "没有门店权限");
         }
         // 校验门店类型
-        ServiceResponse<String> x2 = praseErpType(enterpriseId, storeOpenDTO, storeDTO);
+        ServiceResponse<String> x2 = praseStoreType(enterpriseId, storeOpenDTO, storeDTO);
         if (x2 != null) {
             return x2;
         }
@@ -206,6 +208,10 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
         }
         // 保存门店
 //        return null;
+        if(storeOpenDTO.getStoreInfoId() != null){
+            Integer storeId = storeService.getStoreIdByStoreInfoId(enterpriseId, storeOpenDTO.getStoreInfoId());
+            storeDTO.setStoreId(storeId);
+        }
         ServiceResponse<StoreDTO> serviceResponse = storeApiService.saveOrUpdate(storeDTO);
         if (!serviceResponse.isSuccess()) {
             return EnterpriseServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
@@ -227,12 +233,12 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
         }
     }
 
-    private ServiceResponse<String> praseErpType(Integer enterpriseId, StoreOpenDTO storeOpenDTO, StoreDTO storeDTO) {
-        if (storeOpenDTO.getErpType() != null) {
+    private ServiceResponse<String> praseStoreType(Integer enterpriseId, StoreOpenDTO storeOpenDTO, StoreDTO storeDTO) {
+        if (storeOpenDTO.getStoreType() != null) {
             ServiceResponse<List<StoreDictDTO>> serviceResponse = storeDictApiService.listStoreType(enterpriseId);
             if (serviceResponse.isSuccess()) {
                 List<StoreDictDTO> list = serviceResponse.getResult();
-                Integer erpType = storeOpenDTO.getErpType();
+                Integer erpType = storeOpenDTO.getStoreType();
                 String storeTypeTmp = erpType.toString();
                 for (StoreDictDTO storeDictDTO : list) {
                     if (storeDictDTO.getValue().equals(storeTypeTmp)) {