修改门店标签的传值

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

@@ -23,6 +23,7 @@ public class StoreSearchDTO implements Serializable {
     private Long storeResource;
     private Integer currentPage=1;
     private Integer pageSize=20;
+    private Integer storeTagId;
 
     public Integer getStoreGroupId() {
         return storeGroupId;
@@ -183,4 +184,12 @@ public class StoreSearchDTO implements Serializable {
     public void setStoreCode(String storeCode) {
         this.storeCode = storeCode;
     }
+
+    public Integer getStoreTagId() {
+        return storeTagId;
+    }
+
+    public void setStoreTagId(Integer storeTagId) {
+        this.storeTagId = storeTagId;
+    }
 }

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

@@ -32,7 +32,6 @@ import com.gic.store.web.vo.StoreListSourceVO;
 import com.gic.store.web.vo.StoreOverflowVO;
 import com.gic.wechat.business.api.service.fwh.WeixinBaseFunService;
 import com.gic.wechat.business.api.service.wxa.WeixinWxaFunService;
-import org.apache.catalina.User;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -41,13 +40,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -138,7 +135,7 @@ public class StoreController extends DownloadUtils {
     }
 
     @RequestMapping("/store-list")
-    public RestResponse storeList(@RequestBody StoreSearchDTO storeSearchDTO, Integer storeTagId) {
+    public RestResponse storeList(@RequestBody StoreSearchDTO storeSearchDTO) {
         logger.info("查询条件：{}", JSON.toJSONString(storeSearchDTO));
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         Integer userId = UserDetailUtils.getUserDetail().getUserId();
@@ -148,7 +145,7 @@ public class StoreController extends DownloadUtils {
         }
 
         //门店标签
-        ServiceResponse<StoreTagDTO> storeTagResult = storeTagApiService.getByStoreTagId(storeTagId);
+        ServiceResponse<StoreTagDTO> storeTagResult = storeTagApiService.getByStoreTagId(storeSearchDTO.getStoreTagId());
         if (storeTagResult.isSuccess()) {
             storeSearchDTO.setStoreResource(Long.parseLong(storeTagResult.getResult().getStoreWidgetId().toString()));
         }