分组策略

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreFieldMapper.java

@@ -107,6 +107,13 @@ public interface TabStoreFieldMapper {
 
     int deleteBatch(@Param("storeFieldIds") List<Integer> storeFieldIds);
 
+    /**
+     * 查询
+     * @param storeFieldIds
+     * @return
+     */
+    List<TabStoreField> listByBatchId(@Param("storeFieldIds") List<Integer> storeFieldIds);
+
     int isRepeatCode(@Param("enterpriseId") Integer enterpriseId, @Param("storeFieldId") Integer storeFieldId,
                      @Param("storeFieldCode") String storeFieldCode);
 
@@ -120,4 +127,12 @@ public interface TabStoreFieldMapper {
      * @return
      */
     List<TabStoreField> listStoreFieldByRegionId(@Param("regionId") Integer regionId);
+
+
+    /**
+     * 根据企业ID查询列表数据
+     * @param enterpriseId
+     * @return
+     */
+    List<TabStoreField> listStoreFieldByEnterpriseId(@Param("enterpriseId") Integer enterpriseId);
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/service/StoreFieldService.java

@@ -110,4 +110,19 @@ public interface StoreFieldService {
      * @return
      */
     List<TabStoreField> listStoreFieldByRegionId(Integer regionId);
+
+
+    /**
+     * 根据企业ID查询列表
+     * @param enterpriseId
+     * @return
+     */
+    List<TabStoreField> listStoreFieldByEnterpriseId(Integer enterpriseId);
+
+    /**
+     * 查询
+     * @param storeFieldIds
+     * @return
+     */
+    List<TabStoreField> listByBatchId(List<Integer> storeFieldIds);
 }

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

@@ -157,6 +157,18 @@ public class StoreFieldServiceImpl implements StoreFieldService{
     }
 
     @Override
+    public List<TabStoreField> listStoreFieldByEnterpriseId(Integer enterpriseId) {
+        List<TabStoreField> list = tabStoreFieldMapper.listStoreFieldByEnterpriseId(enterpriseId);
+        return list == null ? new ArrayList<>() : list;
+    }
+
+    @Override
+    public List<TabStoreField> listByBatchId(List<Integer> storeFieldIds) {
+        List<TabStoreField> list = tabStoreFieldMapper.listByBatchId(storeFieldIds);
+        return list == null ? new ArrayList<>() : list;
+    }
+
+    @Override
     public void sortBottom(int enterpriseId, int storeFieldId) {
         Double sort = getMaxSort(enterpriseId);
         TabStoreField storeField = new TabStoreField();

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

@@ -104,18 +104,38 @@ public class StoreFieldApiServiceImpl implements StoreFieldApiService{
             return ServiceResponse.failure(ErrorCode.ERR_5.getCode(), "主键错误，查询不到数据");
         }
         if (storeExtendService.storeExtendHasStoreField(storeFieldId)) {
-            return ServiceResponse.failure(ErrorCode.ERR_5.getCode(), "属性 " + storeField.getStoreFieldName() + "在使用中，不允许删除");
+            return ServiceResponse.failure(ErrorCode.ERR_5.getCode(), "属性 " + storeField.getStoreFieldName() + " 在使用中，不允许删除");
         }
         return ServiceResponse.success(storeFieldService.delete(storeFieldId));
     }
 
     @Override
     public ServiceResponse<Integer> deleteAll(int enterpriseId) {
+        List<TabStoreField> fieldList = storeFieldService.listStoreFieldByEnterpriseId(enterpriseId);
+        StringBuilder resultMessage = new StringBuilder();
+        for (TabStoreField field : fieldList) {
+            if (storeExtendService.storeExtendHasStoreField(field.getStoreFieldId())) {
+                resultMessage.append("属性 ").append(field.getStoreFieldName()).append(" 在使用中，不允许删除；");
+            }
+        }
+        if (StringUtils.isNotBlank(resultMessage.toString())) {
+            return ServiceResponse.failure(ErrorCode.ERR_5.getCode(), resultMessage.toString());
+        }
         return ServiceResponse.success(storeFieldService.deleteAll(enterpriseId));
     }
 
     @Override
     public ServiceResponse<Integer> deleteBatch(List<Integer> storeFieldIds) {
+        List<TabStoreField> fieldList = storeFieldService.listByBatchId(storeFieldIds);
+        StringBuilder resultMessage = new StringBuilder();
+        for (TabStoreField field : fieldList) {
+            if (storeExtendService.storeExtendHasStoreField(field.getStoreFieldId())) {
+                resultMessage.append("属性 ").append(field.getStoreFieldName()).append(" 在使用中，不允许删除；");
+            }
+        }
+        if (StringUtils.isNotBlank(resultMessage.toString())) {
+            return ServiceResponse.failure(ErrorCode.ERR_5.getCode(), resultMessage.toString());
+        }
         return ServiceResponse.success(storeFieldService.deleteBatch(storeFieldIds));
     }
 

gic-store-service/src/main/java/com/gic/store/service/outer/StoreStrategyApiServiceImpl.java

@@ -230,7 +230,7 @@ public class StoreStrategyApiServiceImpl implements StoreStrategyApiService{
         for (TabStore store : storeList) {
             String result = storeStrategyService.isHitStrategy(store.getStoreId(), store.getEnterpriseId(), StoreGroupConstant.STORE_GROUP_STRATEGY_TYPE);
             if (StringUtils.isNotBlank(result)) {
-                //todo 更新门店分组值
+                storeService.updateStoreGroupId(store.getStoreId(), Integer.parseInt(result));
             }
         }
         return ServiceResponse.success();

gic-store-service/src/main/resources/mapper/TabStoreFieldMapper.xml

@@ -283,4 +283,29 @@
     </if>
     order by sort
   </select>
+
+
+  <select id="listStoreFieldByEnterpriseId" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_store_field
+    where status = 1
+    <if test="enterpriseId != null ">
+      and enterprise_id = #{enterpriseId}
+    </if>
+    order by sort
+  </select>
+
+
+
+  <select id="listByBatchId" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_store_field
+    where where store_field_id in
+    <foreach collection="storeFieldIds" index="index" item="item" open="(" separator="," close=")">
+      #{item}
+    </foreach>
+    order by sort
+  </select>
 </mapper>
\ No newline at end of file