加字段

gic-store-api/src/main/java/com/gic/store/service/StoreApiService.java

@@ -44,7 +44,6 @@ public interface StoreApiService {
      * @param storeSearchDTO
      * @param pageNum
      * @param pageSize
-     * @param returnFileds
      * @return com.gic.api.base.commons.ServiceResponse
      * @throws
      */
@@ -197,7 +196,7 @@ public interface StoreApiService {
     
     /** @Description: 删除门店 from es
      * @author taogs
-     * @Date 13:37 2019/9/25
+     * @Date 18:44 2019/9/25
      * @Param 
      * @return 
     */
@@ -210,4 +209,6 @@ public interface StoreApiService {
      * @return 
     */
     ServiceResponse<JSONObject> parseStoreSelectJson(String searchJson);
+
+    ServiceResponse<List<StoreDTO>> listStoreByStoreInfoId(Integer storeInfoId);
 }

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

@@ -317,14 +317,19 @@ public class StoreApiServiceImpl implements StoreApiService {
             for(int j =0 ;j< list.size(); j++){
                 jsonObjectList.add(list.getJSONObject(j));
             }
-            JSONObject json = QueryConditionAssemblyUtil.createListQueryNode(jsonObjectList, OperateEnum.OPERATE_AND);
+            JSONObject json = null;
+            if(i > 0 && OperateEnum.OPERATE_AND_NOT.getValue().equals(type)){
+                json = QueryConditionAssemblyUtil.createListQueryNode(jsonObjectList, OperateEnum.OPERATE_AND_NOT);
+            }else {
+                json = QueryConditionAssemblyUtil.createListQueryNode(jsonObjectList, OperateEnum.OPERATE_AND);
+            }
             if(result == null){
                 result = json;
             }else {
                 if(OperateEnum.OPERATE_OR.getValue().equals(type)){
                     result = QueryConditionAssemblyUtil.addQueryNodeForSiblin(result, json, OperateEnum.OPERATE_OR);
                 }else if(OperateEnum.OPERATE_AND_NOT.getValue().equals(type)){
-                    result = QueryConditionAssemblyUtil.addQueryNodeForSiblin(result, json, OperateEnum.OPERATE_AND_NOT);
+                    result = QueryConditionAssemblyUtil.addQueryNodeForSiblin(result, json, OperateEnum.OPERATE_AND);
                 }
             }
         }
@@ -332,6 +337,14 @@ public class StoreApiServiceImpl implements StoreApiService {
     }
 
     @Override
+    public ServiceResponse<List<StoreDTO>> listStoreByStoreInfoId(Integer storeInfoId) {
+        StoreSearchDBDTO searchDBDTO = new StoreSearchDBDTO();
+        searchDBDTO.setStoreInfoId(storeInfoId);
+        this.storeService.listStore(searchDBDTO, 1, Integer.MAX_VALUE);
+        return null;
+    }
+
+    @Override
     public ServiceResponse<StoreDTO> getStoreById(Integer enterpriseId, Integer storeId) {
         String key = Constants.STORE_KEY + enterpriseId + ":" + storeId;
 

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

@@ -10,6 +10,7 @@ import com.gic.auth.service.UnionEnterpriseApiService;
 import com.gic.commons.util.GICMQClientUtil;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.store.constant.StoreGroupConstant;
+import com.gic.store.constant.StoreOwnTypeEnum;
 import com.gic.store.dto.StoreDTO;
 import com.gic.store.dto.StoreSearchDTO;
 import com.gic.store.dto.StoreWidgetDTO;
@@ -86,7 +87,7 @@ public class StoreAuthorizationApiServiceImpl implements StoreAuthorizationApiSe
         storeDTO.setStoreGroupId(Integer.valueOf(groupId));
         storeDTO.setIsEditStoreGroup(0);
         storeDTO.setEnterpriseId(toEnterpriseId);
-        storeDTO.setOwnType(0);
+        storeDTO.setOwnType(StoreOwnTypeEnum.OTHER.getCode());
         int i = this.storeService.authAddStore(storeDTO);
         log.info("{}，门店授权结果：{}", storeDTO.getStoreInfoId(), i);
         if(i > 0){