修改商品详情接口

src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfStationItemController.java

@@ -71,10 +71,11 @@ public class TbCfStationItemController {
      * @return
      */
     @ApiOperation("商品sku")
-    @GetMapping("/queryItemSku/{itemId}")
-    public Result queryItemSku(@ApiParam(value = "商品ID") @PathVariable("itemId") String itemId) {
+    @GetMapping("/queryItemSku")
+    public Result queryItemSku(@ApiParam(value = "商品ID") @RequestParam(value = "itemId") String itemId,
+                               @ApiParam(value = "用户ID") @RequestParam(value = "userId", required = false) String userId) {
 
-        return tbCfStationItemService.queryItemSku(itemId);
+        return tbCfStationItemService.queryItemSku(itemId, userId);
     }
 
     /**
@@ -86,7 +87,7 @@ public class TbCfStationItemController {
     @ApiOperation("商品搜索")
     @GetMapping("/searchItems")
     public Result searchItems(@ApiParam(value = "名字") @RequestParam(value = "name") String name,
-                              @ApiParam(value = "名字") @RequestParam(value = "order", required = false) String order) {
+                              @ApiParam(value = "排序") @RequestParam(value = "order", required = false) String order) {
 
         return tbCfStationItemService.searchItems(name, order);
     }

src/main/java/com/diaoyun/zion/chinafrica/service/TbCfStationItemService.java

@@ -102,7 +102,7 @@ public interface TbCfStationItemService {
      * @param itemId
      * @return
      */
-    Result queryItemSku(String itemId);
+    Result queryItemSku(String itemId,String userId);
 
     /**
      *

src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfStationItemServiceImpl.java

@@ -142,10 +142,18 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
      * @return
      */
     @Override
-    public Result queryItemSku(String itemId) {
+    public Result queryItemSku(String itemId, String userId) {
         Result result = new Result();
         Map<String, Object> map = new HashMap<>();
+        boolean collection = false;
         try {
+            //判断商品是否被收藏
+            if (!StringUtils.isBlank(userId)) {
+                TbCfItemCollectionEntity isCollection = tbCfItemCollectionDao.queryIsCollection(userId, itemId);
+                if (isCollection != null) {
+                    collection = true;
+                }
+            }
             //商品信息
             TbCfStationItemEntity itemInfo = tbCfStationItemDao.queryObject(itemId);
             //商品规格
@@ -204,6 +212,7 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
             String priceRange = priceList.get(0).toString() + "-" + priceList.get(priceList.size() - 1);
             //商品详情
             TbCfItemDescEntity itemDesc = tbCfItemDescDao.queryObject(itemId);
+            map.put("isCollection", collection);
             map.put("itemInfo", itemInfo);
             map.put("itemDesc", itemDesc);
             map.put("itemDetail", skuInfoList);