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/constant/StoreGroupConstant.java

@@ -49,10 +49,6 @@ public class StoreGroupConstant {
     public final static int IS_DEFAULT = 1;
 
 
-
-    public final static int TEST_ENTERPRISE_ID = 1111;
-
-
     /**
      * 分组策略类型是2
      */

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

@@ -34,9 +34,10 @@ public interface StoreFieldApiService {
     
 * @author guojuxing 
      * @param storeFieldId
      * @param isUp
 是否向上移动
+     * @param enterpriseId
      * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Integer>

     
 */
-    ServiceResponse<Integer> upOrDown(int storeFieldId, boolean isUp);
+    ServiceResponse<Integer> upOrDown(int storeFieldId, boolean isUp, Integer enterpriseId);
 
     /**
      * 置顶、置底，自定义序号
@@ -45,9 +46,10 @@ public interface StoreFieldApiService {
     
 * @author guojuxing
      * @param storeFieldId
      * @param setValue
 排序目标值
+     * @param enterpriseId
      * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Integer>

     
 */
-    ServiceResponse<Integer> setStoreFieldSort(int storeFieldId, int setValue);
+    ServiceResponse<Integer> setStoreFieldSort(int storeFieldId, int setValue, Integer enterpriseId);
 
     /**
      * @Title: delete

@@ -157,9 +159,10 @@ public interface StoreFieldApiService {
      * @Description:
     
 * @author guojuxing
      * @param storeFieldId
 主键ID
+     * @param enterpriseId
      * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Integer>

     
 */
-    ServiceResponse<Integer> sortBottom(int storeFieldId);
+    ServiceResponse<Integer> sortBottom(int storeFieldId, Integer enterpriseId);
 
     /**
      *  置顶排序
@@ -167,9 +170,10 @@ public interface StoreFieldApiService {
      * @Description:
     
 * @author guojuxing
      * @param storeFieldId
 主键ID
+     * @param enterpriseId
      * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Integer>

     
 */
-    ServiceResponse<Integer> sortTopping(int storeFieldId);
+    ServiceResponse<Integer> sortTopping(int storeFieldId, Integer enterpriseId);
 
     /**
      * 根据域查询数据

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

 package com.gic.store.service.outer.impl;
 
+import java.util.*;
+
+import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.error.ErrorCode;
-import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.store.constant.StoreOwnTypeEnum;
 import com.gic.store.dto.StoreFieldDTO;
 import com.gic.store.dto.StoreFieldRegionMapDTO;
@@ -16,16 +26,6 @@ import com.gic.store.entity.TabStoreFieldRel;
 import com.gic.store.service.*;
 import com.gic.store.utils.StoreFieldValidParamUtil;
 import com.gic.store.utils.valid.ValidUtil;
-import org.apache.commons.lang.math.NumberUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import java.util.*;
 
 /**
  * @author guojx
@@ -125,9 +125,8 @@ public class StoreFieldApiServiceImpl implements StoreFieldApiService {
     }
 
     @Override
-    public ServiceResponse<Integer> upOrDown(int storeFieldId, boolean isUp) {
+    public ServiceResponse<Integer> upOrDown(int storeFieldId, boolean isUp, Integer enterpriseId) {
         TabStoreField storeField = storeFieldService.getStoreFieldById(storeFieldId);
-        Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         if (storeField == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "主键错误，查询不到数据");
         }
@@ -149,12 +148,12 @@ public class StoreFieldApiServiceImpl implements StoreFieldApiService {
     }
 
     @Override
-    public ServiceResponse<Integer> setStoreFieldSort(int storeFieldId, int setValue) {
+    public ServiceResponse<Integer> setStoreFieldSort(int storeFieldId, int setValue, Integer enterpriseId) {
         TabStoreField storeField = storeFieldService.getStoreFieldById(storeFieldId);
         if (storeField == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "主键错误，查询不到数据");
         }
-        storeFieldService.setStoreFieldSort(storeFieldId, UserDetailUtils.getUserDetail().getEnterpriseId(), setValue);
+        storeFieldService.setStoreFieldSort(storeFieldId, enterpriseId, setValue);
         return ServiceResponse.success();
     }
 
@@ -337,22 +336,22 @@ public class StoreFieldApiServiceImpl implements StoreFieldApiService {
     }
 
     @Override
-    public ServiceResponse<Integer> sortBottom(int storeFieldId) {
+    public ServiceResponse<Integer> sortBottom(int storeFieldId, Integer enterpriseId) {
         TabStoreField storeField = storeFieldService.getStoreFieldById(storeFieldId);
         if (storeField == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "主键错误，查询不到数据");
         }
-        storeFieldService.sortBottom(UserDetailUtils.getUserDetail().getEnterpriseId(), storeFieldId);
+        storeFieldService.sortBottom(enterpriseId, storeFieldId);
         return ServiceResponse.success();
     }
 
     @Override
-    public ServiceResponse<Integer> sortTopping(int storeFieldId) {
+    public ServiceResponse<Integer> sortTopping(int storeFieldId, Integer enterpriseId) {
         TabStoreField storeField = storeFieldService.getStoreFieldById(storeFieldId);
         if (storeField == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "主键错误，查询不到数据");
         }
-        storeFieldService.sortTopping(UserDetailUtils.getUserDetail().getEnterpriseId(), storeFieldId);
+        storeFieldService.sortTopping(enterpriseId, storeFieldId);
         return ServiceResponse.success();
     }
 

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

@@ -131,7 +131,7 @@
     select store_field_id
     from tab_store_field_region_rel
     where status=1
-    <if test="null != list">
+    <if test="null != list and list.size() > 0">
       and region_id in
       <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
         #{item}
@@ -143,7 +143,7 @@
   <update id="deleteFetchByStoreFieldIds" >
     update tab_store_field_region_rel set status = 0
     where status=1
-    <if test="null != list">
+    <if test="null != list and list.size() > 0">
       and store_field_id in
       <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
         #{item}

gic-store-web/src/main/java/com/gic/store/web/controller/StoreFieldController.java

@@ -182,7 +182,7 @@ public class StoreFieldController {
     @RequestMapping("/remove-store-field-batch")
     public RestResponse removeStoreFieldBatch(boolean isDeleteAll, String storeFieldIds) {
         if (isDeleteAll) {
-            ServiceResponse result = storeFieldApiService.deleteAll(StoreGroupConstant.TEST_ENTERPRISE_ID);
+            ServiceResponse result = storeFieldApiService.deleteAll(UserDetailUtils.getUserDetail().getEnterpriseId());
             if (result.isSuccess()) {
                 return RestResponse.success(result.getResult());
             } else {
@@ -270,19 +270,20 @@ public class StoreFieldController {
     public RestResponse swapStoreField(@Validated({ StoreFieldQO.SwapValidView.class,
             StoreFieldQO.RemoveValidView.class }) StoreFieldQO storeFieldQO) {
         int upOrDown = storeFieldQO.getUpOrDown();
+        Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         ServiceResponse result;
         switch (upOrDown) {
         case StoreGroupConstant.SORT_UP:
-            result = storeFieldApiService.upOrDown(storeFieldQO.getStoreFieldId(), true);
+            result = storeFieldApiService.upOrDown(storeFieldQO.getStoreFieldId(), true, enterpriseId);
             break;
         case StoreGroupConstant.SORT_DOWN:
-            result = storeFieldApiService.upOrDown(storeFieldQO.getStoreFieldId(), false);
+            result = storeFieldApiService.upOrDown(storeFieldQO.getStoreFieldId(), false, enterpriseId);
             break;
         case StoreGroupConstant.SORT_BOTTOM:
-            result = storeFieldApiService.sortBottom(storeFieldQO.getStoreFieldId());
+            result = storeFieldApiService.sortBottom(storeFieldQO.getStoreFieldId(), enterpriseId);
             break;
         case StoreGroupConstant.SORT_TOPPING:
-            result = storeFieldApiService.sortTopping(storeFieldQO.getStoreFieldId());
+            result = storeFieldApiService.sortTopping(storeFieldQO.getStoreFieldId(), enterpriseId);
             break;
         default:
             result = null;
@@ -298,7 +299,7 @@ public class StoreFieldController {
     public RestResponse setStoreFieldSortValue(@Validated({ StoreFieldQO.SetSortValueValidView.class,
             StoreFieldQO.RemoveValidView.class }) StoreFieldQO storeFieldQO) {
         ServiceResponse result = storeFieldApiService.setStoreFieldSort(storeFieldQO.getStoreFieldId(),
-                storeFieldQO.getSortValue());
+                storeFieldQO.getSortValue(), UserDetailUtils.getUserDetail().getEnterpriseId());
         if (result.isSuccess()) {
             return RestResponse.success(result.getResult());
         } else {