~API:店铺管理:SPU列表:逻辑调整;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtGoodsFilterParam.java

@@ -5,10 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import javax.validation.constraints.*;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -16,7 +13,8 @@ import java.math.BigDecimal;
 @Data
 public class GoblinStoreMgtGoodsFilterParam implements Serializable {
     private static final long serialVersionUID = -4698854628491039006L;
-    @ApiModelProperty(position = 10, required = false, value = "店铺ID[64]")
+    @ApiModelProperty(position = 10, required = true, value = "店铺ID[64]")
+    @NotBlank(message = "店铺ID不能为空")
     private String storeId;
     @ApiModelProperty(position = 11, required = true, value = "当前记录起始索引", example = "1")
     @Min(value = 1, message = "起始索引无效")

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreMgtGoodsController.java

@@ -34,7 +34,9 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -56,19 +58,13 @@ public class GoblinStoreMgtGoodsController {
     @ApiOperation(value = "SPU列表")
     @PostMapping("list")
     public ResponseDto<PagedResult<GoblinStoreMgtGoodsListVo>> list(@Valid @RequestBody GoblinStoreMgtGoodsFilterParam storeMgtGoodsFilterParam) {
-        List<String> storeIds = goblinRedisUtils.getStoreIds(CurrentUtil.getCurrentUid());
-        boolean storeIdIsBlank = StringUtils.isBlank(storeMgtGoodsFilterParam.getStoreId());
-        if (CollectionUtils.isEmpty(storeIds) || (
-                !storeIdIsBlank && !goblinRedisUtils.hasStoreId(CurrentUtil.getCurrentUid(), storeMgtGoodsFilterParam.getStoreId())
-        )) {
+        String currentUid = CurrentUtil.getCurrentUid();
+        if (!goblinRedisUtils.hasStoreId(currentUid, storeMgtGoodsFilterParam.getStoreId())) {
             return ResponseDto.success();
         }
         if (log.isDebugEnabled()) {
             log.debug("商品管理:SPU列表:[GoblinStoreMgtGoodsFilterParam={}]", JsonUtils.toJson(storeMgtGoodsFilterParam));
         }
-        if (storeIdIsBlank) {
-            storeMgtGoodsFilterParam.setStoreId(storeIds.get(0));
-        }
         return ResponseDto.success(goblinstoreMgtGoodsService.goodsList(storeMgtGoodsFilterParam));
     }