门店状态变更

gic-store-api/src/main/java/com/gic/store/dto/StoreDTO.java

@@ -30,11 +30,6 @@ public class StoreDTO extends StoreInfoDTO implements Serializable {
     private Integer ownType;
 
     /**
-     * 
-     */
-    private Integer status;
-
-    /**
      *
      */
     private Integer storeGroupId;
@@ -94,14 +89,6 @@ public class StoreDTO extends StoreInfoDTO implements Serializable {
     public void setOwnType(Integer ownType) {
         this.ownType = ownType;
     }
-    @Override
-    public Integer getStatus() {
-        return status;
-    }
-    @Override
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
 
     public Integer getEnterpriseId() {
         return enterpriseId;
@@ -261,7 +248,6 @@ public class StoreDTO extends StoreInfoDTO implements Serializable {
                 "storeId=" + storeId +
                 ", enterpriseId=" + enterpriseId +
                 ", ownType=" + ownType +
-                ", status=" + status +
                 ", storeGroupId=" + storeGroupId +
                 ", storeGroupIdList=" + storeGroupIdList +
                 ", storeGroupName='" + storeGroupName + '\'' +

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

@@ -558,13 +558,13 @@ public class StoreApiServiceImpl implements StoreApiService {
     private void getStatus(StoreDTO storeDTO) {
         // 所有必填字段都填之后才能走策略 不然就是未启用  必填字段一共有门店名称 门店代码 门店域  店招品牌，
         // 门店名称 门店代码 门店域没有的话不能创建  能走到这里只有店招品牌有可能没有
-        if (StringUtils.isNotBlank(storeDTO.getBrandIds())) {
-            if (storeDTO.getStatus() == null) {
+        if(storeDTO.getStatus() == null){
+            if (StringUtils.isNotBlank(storeDTO.getBrandIds())) {
                 String hitStrategy = storeStrategyService.isHitStrategy(storeDTO, StoreGroupConstant.STORE_STRATEGY_TYPE);
-                storeDTO.setStatus(StringUtils.isNotBlank(hitStrategy) ? Integer.valueOf(hitStrategy) : StoreEnableOrDisAbleEnum.DISABLE.getCode());
+                storeDTO.setStatus(StringUtils.isNotBlank(hitStrategy) ? Integer.valueOf(hitStrategy) : StoreStatusEnum.INONLINE.getCode());
+            } else {
+                storeDTO.setStatus(StoreStatusEnum.INONLINE.getCode());
             }
-        } else {
-            storeDTO.setStatus(StoreEnableOrDisAbleEnum.DISABLE.getCode());
         }
     }
 

gic-store-web/src/main/java/com/gic/store/web/qo/store/StoreQO.java

@@ -78,7 +78,7 @@ public class StoreQO implements Serializable {
     private Integer overflowStatus;
 
     /**
-     * 门店启用状态；1启用  2不启用
+     * 门店状态；1上线  2未上线  3停业整顿  4闭店
      */
     private Integer status;