Merge branch 'developer' into 'master'

Developer

See merge request !26

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

@@ -125,6 +125,15 @@ public interface StoreApiService {
     */
     ServiceResponse<StoreDTO> getStoreByStoreInfoId(Integer enterpriseId, Integer storeInfoId);
 
+
+    /** @Description: 数据库查询
+     * @author taogs
+     * @Date 14:54 2020/7/29
+     * @Param
+     * @return
+    */
+    ServiceResponse<StoreDTO> getStoreByStoreInfoIdFromDb(Integer enterpriseId, Integer storeInfoId);
+
     ServiceResponse<StoreDTO> getStoreByStoreCode(Integer enterpriseId, Integer regionId, String storeCode);
 
     /**
@@ -382,4 +391,6 @@ public interface StoreApiService {
      * @throws
      */
     ServiceResponse<Void> tranOverFlow(Integer enterpriseId, String storeIds);
+
+    ServiceResponse<List<StoreDTO>> listStoreFromDb(Integer enterpriseId, StoreSearchDBDTO storeSearchDBDTO);
 }

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

@@ -309,6 +309,16 @@ public class StoreApiServiceImpl implements StoreApiService {
     }
 
     @Override
+    public ServiceResponse<List<StoreDTO>> listStoreFromDb(Integer enterpriseId, StoreSearchDBDTO storeSearchDBDTO) {
+        if(enterpriseId != null){
+            storeSearchDBDTO.setEnterpriseId(enterpriseId);
+            com.github.pagehelper.Page<StoreDTO> storeDTOS = this.storeService.listStore(storeSearchDBDTO, 1, Integer.MAX_VALUE);
+            return ServiceResponse.success(storeDTOS.getResult());
+        }
+        return ServiceResponse.success();
+    }
+
+    @Override
     public ServiceResponse<Integer> countByOverflowStatus(Integer enterpriseId) {
         this.storeService.countByOverflowStatus(enterpriseId, 0);
         return EnterpriseServiceResponse.success(this.storeService.countByOverflowStatus(enterpriseId, 0));
@@ -523,7 +533,7 @@ public class StoreApiServiceImpl implements StoreApiService {
             sortJson = QueryConditionAssemblyUtil.createSortNode(StoreESFieldsEnum.UPDATETIME.getField(), QueryConditionAssemblyUtil.SORT_RULE_DESC);
         }
         ServiceResponse<ESResponseQueryBatchDTO> response = this.queryStoreFromES(enterpriseJson, pageNum, pageSize, sortJson, returnFileds);
-        if (response.isSuccess()) {
+        if (response.isSuccess() && response.getResult() != null) {
             Page<StoreDTO> page = new Page(pageNum, pageSize);
             page.setTotalCount(Integer.valueOf(response.getResult().getTotalNumber() + ""));
             List<JSONObject> list = response.getResult().getRes();
@@ -1071,6 +1081,18 @@ public class StoreApiServiceImpl implements StoreApiService {
     }
 
     @Override
+    public ServiceResponse<StoreDTO> getStoreByStoreInfoIdFromDb(Integer enterpriseId, Integer storeInfoId) {
+        StoreSearchDBDTO storeSearchDBDTO = new StoreSearchDBDTO();
+        storeSearchDBDTO.setEnterpriseId(enterpriseId);
+        storeSearchDBDTO.setStoreId(storeInfoId);
+        com.github.pagehelper.Page<StoreDTO> storeDTOS = this.storeService.listStore(storeSearchDBDTO, 1, 1);
+        if(storeDTOS != null && CollectionUtils.isNotEmpty(storeDTOS.getResult())){
+            return ServiceResponse.success(storeDTOS.getResult().get(0));
+        }
+        return ServiceResponse.success();
+    }
+
+    @Override
     public ServiceResponse<StoreDTO> getStoreByStoreCode(Integer enterpriseId, Integer regionId, String storeCode) {
         StoreSearchDBDTO storeSearchDBDTO = new StoreSearchDBDTO();
         storeSearchDBDTO.setEnterpriseId(enterpriseId);
@@ -1461,9 +1483,12 @@ public class StoreApiServiceImpl implements StoreApiService {
     private JSONObject buildSearchJSON(StoreSearchDTO storeSearchDTO){
         logger.info("查询条件：{}", JSON.toJSONString(storeSearchDTO));
         List<JSONObject> jsonObjectList = new ArrayList<>();
-        JSONObject enterpriseJson = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.ENTERPRISEID.getField(), OperateEnum.OPERATE_EQ, storeSearchDTO.getEnterpriseId());
-        jsonObjectList.add(enterpriseJson);
         JSONObject json = null;
+        JSONObject enterpriseJson = null;
+        if(storeSearchDTO.getEnterpriseId() != null){
+            enterpriseJson = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.ENTERPRISEID.getField(), OperateEnum.OPERATE_EQ, storeSearchDTO.getEnterpriseId());
+            jsonObjectList.add(enterpriseJson);
+        }
         if (storeSearchDTO.getStoreGroupId() != null) {
             json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STOREGROUPIDLIST.getField(), OperateEnum.OPERATE_ARR_CONTAIN, storeSearchDTO.getStoreGroupId());
             jsonObjectList.add(json);