门店品牌变更

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

@@ -65,7 +65,7 @@ public class StoreOpenDTO implements Serializable {
     /**
      * 店招品牌
      */
-    private String brand;
+    private Integer storeBrandId;
 
     /**
      * 省
@@ -179,12 +179,12 @@ public class StoreOpenDTO implements Serializable {
         this.businessTime = businessTime;
     }
 
-    public String getBrand() {
-        return brand;
+    public Integer getStoreBrandId() {
+        return storeBrandId;
     }
 
-    public void setBrand(String brand) {
-        this.brand = brand;
+    public void setStoreBrandId(Integer storeBrandId) {
+        this.storeBrandId = storeBrandId;
     }
 
     public String getAddress() {
@@ -282,7 +282,7 @@ public class StoreOpenDTO implements Serializable {
                 ", conactsPhone='" + conactsPhone + '\'' +
                 ", businessTime='" + businessTime + '\'' +
                 ", groupName='" + groupName + '\'' +
-                ", brand='" + brand + '\'' +
+                ", storeBrandId=" + storeBrandId +
                 ", province='" + province + '\'' +
                 ", city='" + city + '\'' +
                 ", county='" + county + '\'' +

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

@@ -161,7 +161,7 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
             }
             storeOpenDTO.setStoreInfoId(store.getStoreInfoId());
         }
-        if (StringUtils.isBlank(storeOpenDTO.getBrand())) {
+        if (storeOpenDTO.getStoreBrandId() != null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "店招品牌不能为空");
         }
         // 校验权限
@@ -186,7 +186,7 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
                 storeDTO.setStoreGroupId(group.getStoreGroupId());
             }
         }
-        TabStoreBrand brand = storeBrandService.getByStoreBrandName(enterpriseId, storeOpenDTO.getBrand());
+        TabStoreBrand brand = storeBrandService.getById(storeOpenDTO.getStoreBrandId());
         if (brand == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "店招品牌不存在");
         }