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/service/StoreFieldApiService.java

@@ -197,4 +197,34 @@ public interface StoreFieldApiService {
     
 */
     ServiceResponse<Void> authStoreField(Integer fromEnterpriseId, Integer toEnterpriseId, List<Integer> regionIdList);
 
+    /**
+     * 查询商户的own字段（去除被授权的字段）
+     * @Title: listOwnStoreField

+     * @Description:
+    
 * @author guojuxing
+     * @param enterpriseId

+     * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.StoreFieldDTO>>

+    
 */
+    ServiceResponse<List<StoreFieldDTO>> listOwnStoreField(Integer enterpriseId);
+
+    /**
+     * 设置ERP映射
+     * @Title: setErpMapperCode

+     * @Description:
+    
 * @author guojuxing
+     * @param storeFieldId
+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>

+    
 */
+    ServiceResponse<Void> setErpMapperCode(Integer storeFieldId);
+
+    /**
+     * 解除ERP关联
+     * @Title: unBindErpMapperCode

+     * @Description: 
+    
 * @author guojuxing
+     * @param storeFieldId

+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>

+    
 */
+    ServiceResponse<Void> unBindErpMapper(Integer storeFieldId);
+
 }

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

@@ -63,6 +63,17 @@ public interface StoreRegionApiService {
     ServiceResponse<List<StoreRegionDTO>> listStoreRegion(Integer enterpriseId, String search, Integer ownType);
 
     /**
+     * 查询自有的门店域
+     * @Title: listOwnerStoreRegion
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.StoreRegionDTO>>
+     * @throws
+     */
+    ServiceResponse<List<StoreRegionDTO>> listOwnerStoreRegion(Integer enterpriseId);
+
+    /**
      * @Title: getStoreRegionByRegion
      * @Description: 查询门店域详情
      * @author zhiwj 

gic-store-service/src/main/java/com/gic/store/service/impl/StoreFieldServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -33,6 +34,7 @@ public class StoreFieldServiceImpl implements StoreFieldService{
 
     @Override
     public int edit(StoreFieldDTO storeFieldDTO) {
+        storeFieldDTO.setUpdateTime(new Date());
         return tabStoreFieldMapper.updateByPrimaryKeySelective(EntityUtil.changeEntityNew(TabStoreField.class, storeFieldDTO));
     }
 

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

@@ -406,4 +406,43 @@ public class StoreFieldApiServiceImpl implements StoreFieldApiService {
         storeFieldRelService.saveFetch(storeFieldRelList);
         return ServiceResponse.success();
     }
+
+    @Override
+    public ServiceResponse<List<StoreFieldDTO>> listOwnStoreField(Integer enterpriseId) {
+        //查询有效的域ID list
+        List<Integer> regionIdList = storeRegionService.listStoreRegion(enterpriseId);
+        //根据域查询字段ID list
+        List<Integer> storeFieldIdList = storeFieldRegionRelService.listStoreFieldId(regionIdList);
+        //查询商户下所有的owner 自定义字段值
+        List<StoreFieldDTO> storeFieldList = storeFieldService.listOwnStoreField(enterpriseId, storeFieldIdList);
+        return ServiceResponse.success(storeFieldList);
+    }
+
+    @Override
+    public ServiceResponse<Void> setErpMapperCode(Integer storeFieldId) {
+        TabStoreField storeField = storeFieldService.getStoreFieldById(storeFieldId);
+        if (storeField == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "主键错误，查询不到数据");
+        }
+        StoreFieldDTO dto = new StoreFieldDTO();
+        dto.setStoreFieldId(storeFieldId);
+        //表明已经做关联
+        dto.setErpRelCode("1");
+        storeFieldService.edit(dto);
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<Void> unBindErpMapper(Integer storeFieldId) {
+        TabStoreField storeField = storeFieldService.getStoreFieldById(storeFieldId);
+        if (storeField == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "主键错误，查询不到数据");
+        }
+        StoreFieldDTO dto = new StoreFieldDTO();
+        dto.setStoreFieldId(storeFieldId);
+        //表明已经解除关联
+        dto.setErpRelCode("");
+        storeFieldService.edit(dto);
+        return ServiceResponse.success();
+    }
 }

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

@@ -114,6 +114,12 @@ public class StoreRegionApiServiceImpl implements StoreRegionApiService {
     }
 
     @Override
+    public ServiceResponse<List<StoreRegionDTO>> listOwnerStoreRegion(Integer enterpriseId) {
+        List<StoreRegionDTO> list = storeRegionService.listStoreRegion(enterpriseId, null, StoreOwnTypeEnum.OWNER.getCode());
+        return ServiceResponse.success(list);
+    }
+
+    @Override
     public ServiceResponse<StoreRegionDTO> getStoreRegionByRegion(Integer enterpriseId, Integer regionId) {
         return ServiceResponse.success(EntityUtil.changeEntityByOrika(StoreRegionDTO.class, storeRegionService.getById(enterpriseId, regionId)));
     }