Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

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

@@ -37,7 +37,6 @@ public class StoreFieldSelectDTO implements Serializable {
     /**
      * 属性code
      */
-    @NotBlank(message = "属性值code不能为空", groups = {SaveStoreFieldSelectValid.class, EditStoreFieldSelectValid.class})
     private String storeFieldSelectCode;
 
     /**

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

@@ -17,6 +17,7 @@ import com.gic.store.service.StoreFieldSelectService;
 import com.gic.store.service.StoreFieldService;
 import com.gic.store.utils.valid.ValidUtil;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -45,9 +46,12 @@ public class StoreFieldSelectApiServiceImpl implements StoreFieldSelectApiServic
             return paramValid;
         }
 
-        if (storeFieldSelectService.isRepeatCode(storeFieldSelectDTO.getStoreFieldId(), null,
-                storeFieldSelectDTO.getStoreFieldSelectCode())) {
-            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "属性值code不能重复");
+        boolean isCodeNotNull = StringUtils.isBlank(storeFieldSelectDTO.getStoreFieldSelectCode());
+        if (isCodeNotNull) {
+            if (storeFieldSelectService.isRepeatCode(storeFieldSelectDTO.getStoreFieldId(), null,
+                    storeFieldSelectDTO.getStoreFieldSelectCode())) {
+                return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "属性值code不能重复");
+            }
         }
 
         if (storeFieldSelectService.isRepeatName(storeFieldSelectDTO.getStoreFieldId(), null,
@@ -135,9 +139,12 @@ public class StoreFieldSelectApiServiceImpl implements StoreFieldSelectApiServic
             return paramValid;
         }
 
-        if (storeFieldSelectService.isRepeatCode(storeFieldSelectDTO.getStoreFieldId(),
-                storeFieldSelectDTO.getStoreFieldSelectId(), storeFieldSelectDTO.getStoreFieldSelectCode())) {
-            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "属性值code不能重复");
+        boolean isCodeNotNull = StringUtils.isBlank(storeFieldSelectDTO.getStoreFieldSelectCode());
+        if (isCodeNotNull) {
+            if (storeFieldSelectService.isRepeatCode(storeFieldSelectDTO.getStoreFieldId(),
+                    storeFieldSelectDTO.getStoreFieldSelectId(), storeFieldSelectDTO.getStoreFieldSelectCode())) {
+                return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "属性值code不能重复");
+            }
         }
 
         if (storeFieldSelectService.isRepeatName(storeFieldSelectDTO.getStoreFieldId(),

gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

@@ -157,6 +157,18 @@ public class StoreController extends DownloadUtils {
         }
     }
 
+    @RequestMapping("online-store-count")
+    public RestResponse onlineStoreCount(){
+        StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
+        storeSearchDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        storeSearchDTO.setStatus(StoreStatusEnum.ONLINE.getCode());
+        if(UserDetailUtils.getUserDetail().getUserResourceInfo() != null){
+            storeSearchDTO.setStoreResource(UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource());
+        }
+        ServiceResponse<Long> response = this.storeApiService.queryStoreCountFromES(storeSearchDTO);
+        return RestResponse.success(response.getResult());
+    }
+
     @RequestMapping("store-list-source")
     public RestResponse storeListSource() {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();

gic-store-web/src/main/java/com/gic/store/web/qo/storefield/StoreFieldSelectQO.java

@@ -54,7 +54,6 @@ public class StoreFieldSelectQO implements Serializable{
     /**
      * 属性code
      */
-    @NotBlank(message = "属性值code不能为空", groups = {SaveValidView.class, EditValidView.class})
     private String storeFieldSelectCode;
 
     /**