Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-webapp-plug into developer

src/main/java/com/gic/plug/web/controller/goods/GoodsController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -76,7 +77,7 @@ public class GoodsController extends BaseGoodsController {
         //商品信息
         List<JSONObject> list = serviceResponse.getResult().getRes();
         if (CollectionUtils.isEmpty(list)) {
-            return RestResponse.success(serviceResponse.getResult());
+            return RestResponse.success(Collections.EMPTY_LIST);
         }
         //1、获取商品信息
         List<GoodsVO> goodsVOS = Lists.newArrayList();

src/main/java/com/gic/plug/web/controller/goods/GoodsSelectorController.java

@@ -159,4 +159,12 @@ public class GoodsSelectorController extends BaseGoodsController {
         }
         return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
     }
+
+    @RequestMapping("check-selector-goods-hit")
+    public RestResponse checkSelectorGoodsHit(Long goodsSelectorId, String goodsCode, String skuCode) {
+        ServiceResponse<Boolean>  serviceResponse =
+                goodsSelectorApiService.isSelectorHitGoods(goodsSelectorId, skuCode, goodsCode, 1129);
+        return RestResponse.success(serviceResponse.getResult());
+    }
+
 }