门店域多次授权错乱调整

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

@@ -44,6 +44,7 @@ public class StoreSearchDTO implements Serializable {
     private String realStatuss;
     private String storeTags;
     private String storeBrandIds;
+    private Integer ownType;
 
     public Integer getStoreGroupId() {
         return storeGroupId;
@@ -311,6 +312,15 @@ public class StoreSearchDTO implements Serializable {
         this.storeBrandIds = storeBrandIds;
     }
 
+    public Integer getOwnType() {
+        return ownType;
+    }
+
+    public StoreSearchDTO setOwnType(Integer ownType) {
+        this.ownType = ownType;
+        return this;
+    }
+
     @Override
     public String toString() {
         return "StoreSearchDTO{" +
@@ -347,6 +357,7 @@ public class StoreSearchDTO implements Serializable {
                 ", realStatuss='" + realStatuss + '\'' +
                 ", storeTags='" + storeTags + '\'' +
                 ", storeBrandIds='" + storeBrandIds + '\'' +
+                ", ownType='" + ownType + '\'' +
                 '}';
     }
 }

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

@@ -1917,6 +1917,10 @@ public class StoreApiServiceImpl implements StoreApiService {
             json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STORECODE.getField(), OperateEnum.OPERATE_EQ, storeSearchDTO.getStoreCode());
             jsonObjectList.add(json);
         }
+        if (storeSearchDTO.getOwnType() != null) {
+            json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.OWNTYPE.getField(), OperateEnum.OPERATE_EQ, storeSearchDTO.getOwnType());
+            jsonObjectList.add(json);
+        }
         return json;
     }
 

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

@@ -81,6 +81,7 @@ public class StoreAuthorizationApiServiceImpl implements StoreAuthorizationApiSe
         StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
         storeSearchDTO.setEnterpriseId(ownEnterpriseId);
         storeSearchDTO.setSearchJson(storeWidgetDTO.getSearchParam());
+        storeSearchDTO.setOwnType(StoreOwnTypeEnum.OWNER.getCode());
         Long count = this.storeApiService.queryStoreCountFromEs(storeSearchDTO).getResult();
         if(count < 0){
             this.unionEnterpriseAuthResDetailApiService.unionForStore(UnionEnterpriseAuthDetailStatusEnum.HAS_AUTH.getCode(), ownEnterpriseId, unionEnterpriseId, key, "授权成功");