门店导出修改

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

@@ -5,6 +5,7 @@ import java.io.Serializable;
 public class StoreSearchDTO implements Serializable {
     private Integer storeGroupId;
     private Integer regionId;
+    private String storeCode;
     private String search;
     private Integer createType;
     private Integer status;
@@ -174,4 +175,12 @@ public class StoreSearchDTO implements Serializable {
     public void setStoreResource(Long storeResource) {
         this.storeResource = storeResource;
     }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
 }

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

@@ -22,6 +22,14 @@ public interface StoreApiService {
      * @throws
      */
     ServiceResponse<Integer> saveOrUpdate(StoreDTO storeDTO);
+    
+    /** @Description: 通过订单创建门店
+     * @author taogs
+     * @Date 19:07 2020/1/7
+     * @Param 
+     * @return 
+    */
+    ServiceResponse<Integer> saveStoreForOrder(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String orderNum);
     /**
      * @Title: listStore
      * @Description: 分页门店列表 查es
@@ -66,6 +74,8 @@ public interface StoreApiService {
     */
     ServiceResponse<StoreDTO> getStoreByStoreInfoId(Integer enterpriseId, Integer storeInfoId);
 
+    ServiceResponse<StoreDTO> getStoreByStoreCode(Integer enterpriseId, Integer regionId, String storeCode);
+
     /**
      * @Title: validateFieldExceptRepeat
      * @Description: 校验除 是否重复 外的所有条件

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

@@ -179,6 +179,16 @@ public class StoreApiServiceImpl implements StoreApiService {
         return ServiceResponse.success();
     }
 
+    @Override
+    public ServiceResponse<Integer> saveStoreForOrder(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String orderNum) {
+        StoreDTO storeDTO = new StoreDTO();
+        storeDTO.setEnterpriseId(enterpriseId);
+        storeDTO.setStoreCode(storeCode);
+        storeDTO.setStoreName(storeName);
+        storeDTO.setRegionId(regionId);
+        return this.saveOrUpdate(storeDTO);
+    }
+
     /**
      * 修改日志
      */
@@ -615,6 +625,22 @@ public class StoreApiServiceImpl implements StoreApiService {
         return ServiceResponse.success();
     }
 
+    @Override
+    public ServiceResponse<StoreDTO> getStoreByStoreCode(Integer enterpriseId, Integer regionId, String storeCode) {
+        StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
+        storeSearchDTO.setEnterpriseId(enterpriseId);
+        storeSearchDTO.setStoreCode(storeCode);
+        storeSearchDTO.setRegionId(regionId);
+        ServiceResponse<Page<StoreDTO>> response = this.listStore(storeSearchDTO, 1, 1);
+        if(response.isSuccess() && response.getResult() != null){
+            List<StoreDTO> result = response.getResult().getResult();
+            if(CollectionUtils.isNotEmpty(result)){
+                return ServiceResponse.success(result.get(0));
+            }
+        }
+        return ServiceResponse.success();
+    }
+
     private StoreDTO getStoreDTO(Integer enterpriseId, Integer storeId) {
         StoreDTO store = storeService.getById(storeId);
         if (store == null) {
@@ -971,6 +997,10 @@ public class StoreApiServiceImpl implements StoreApiService {
             json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STATUS.getField(), OperateEnum.OPERATE_EQ, storeSearchDTO.getStatus());
             jsonObjectList.add(json);
         }
+        if (StringUtils.isNotBlank(storeSearchDTO.getStoreCode())) {
+            json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STORECODE.getField(), OperateEnum.OPERATE_EQ, storeSearchDTO.getStoreCode());
+            jsonObjectList.add(json);
+        }
         if (StringUtils.isNotBlank(storeSearchDTO.getSearch())) {
             JSONObject storeNameSearch = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STORENAME.getField(), OperateEnum.OPERATE_LIKE, storeSearchDTO.getSearch());
             JSONObject storeCodeSearch = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STORECODE.getField(), OperateEnum.OPERATE_LIKE, storeSearchDTO.getSearch());