修改商品属性接口

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

@@ -169,4 +169,25 @@ public class TbCfStationItemController {
 
         return tbCfStationItemService.delCollection(collectionIds);
     }
+
+    /**
+     *
+     * @return
+     */
+    public Result queryHotItem() {
+
+        return new Result();
+    }
+
+    /**
+     *
+     * @param userId
+     * @return
+     */
+
+    @ApiOperation("搜索记录")
+    @GetMapping("/querySearchHistory")
+    public Result querySearchHistory(@ApiParam(value = "用户ID") @PathVariable("userId") String userId){
+        return new Result();
+    }
 }

src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfOptionDao.java

@@ -3,6 +3,8 @@ package com.diaoyun.zion.chinafrica.dao;
 import com.diaoyun.zion.chinafrica.entity.TbCfOptionEntity;
 import com.diaoyun.zion.master.dao.BaseDao;
 
+import java.util.List;
+
 
 /**
  * 商品属性Dao
@@ -16,4 +18,8 @@ public interface TbCfOptionDao extends BaseDao<TbCfOptionEntity> {
     int changStatusBatch(String[] itemIds);
 
     int deleteByItemId(String itemId);
+
+    List<TbCfOptionEntity> queryByItemId(String itemId);
+
+    List<TbCfOptionEntity> queryByCid(String cid);
 }

src/main/java/com/diaoyun/zion/chinafrica/entity/ItemOption.java

+package com.diaoyun.zion.chinafrica.entity;
+
+import java.util.List;
+
+/**
+ * @Auther: wudepeng
+ * @Date: 2020/01/02
+ * @Description:商品属性
+ */
+public class ItemOption {
+
+    private String categoryId;
+    private String categoryName;
+    private List<TbCfOptionEntity> optionList;
+
+    public String getCategoryId() {
+        return categoryId;
+    }
+
+    public void setCategoryId(String categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    public String getCategoryName() {
+        return categoryName;
+    }
+
+    public void setCategoryName(String categoryName) {
+        this.categoryName = categoryName;
+    }
+
+    public List<TbCfOptionEntity> getOptionList() {
+        return optionList;
+    }
+
+    public void setOptionList(List<TbCfOptionEntity> optionList) {
+        this.optionList = optionList;
+    }
+}

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

@@ -8,6 +8,7 @@ import com.diaoyun.zion.master.enums.ResultCodeEnum;
 import com.diaoyun.zion.master.util.IdUtil;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.ApiOperation;
+import net.bytebuddy.asm.Advice;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,6 +40,12 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
     @Autowired
     private TbCfItemCollectionDao tbCfItemCollectionDao;
 
+    @Autowired
+    private TbCfCategoryDao tbCfCategoryDao;
+
+    @Autowired
+    private TbCfOptionDao tbCfOptionDao;
+
     @Override
     public TbCfStationItemEntity queryObject(String itemId) {
         return tbCfStationItemDao.queryObject(itemId);
@@ -130,13 +137,24 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
     public Result queryItemSku(String itemId) {
         Result result = new Result();
         Map<String, Object> map = new HashMap<>();
-        //商品信息
-        TbCfStationItemEntity itemInfo = tbCfStationItemDao.queryObject(itemId);
         try {
+            //商品信息
+            TbCfStationItemEntity itemInfo = tbCfStationItemDao.queryObject(itemId);
+            //商品规格
+            List<TbCfCategoryEntity> categoryList = tbCfCategoryDao.queryByItemId(itemId);
+            List<ItemOption> itemOptionList = new ArrayList<>();
+            for (int i = 0; i < categoryList.size(); i++) {
+                ItemOption itemOption = new ItemOption();
+                itemOption.setCategoryId(categoryList.get(i).getCategoryId());
+                itemOption.setCategoryName(categoryList.get(i).getCategoryName());
+                List<TbCfOptionEntity> optionList = tbCfOptionDao.queryByCid(categoryList.get(i).getCategoryId());
+                itemOption.setOptionList(optionList);
+                itemOptionList.add(itemOption);
+            }
+
             //商品sku
             List<BigDecimal> priceList = new ArrayList<>();
             List<TbCfItemSkusEntity> itemSkuList = tbCfItemSkusDao.querySkusByItemId(itemId);
-
             List<ItemSkuInfo> skuInfoList = new ArrayList<>();
             for (TbCfItemSkusEntity itemSkusEntity : itemSkuList) {
                 ItemSkuInfo skuInfo = new ItemSkuInfo();
@@ -166,6 +184,8 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
             map.put("itemInfo", itemInfo);
             map.put("itemDesc", itemDesc);
             map.put("itemDetail", skuInfoList);
+            // map.put("categoryList", categoryList);
+            map.put("optionList", itemOptionList);
             // map.put("priceRange", priceRange);
             result.setData(map).setMessage(ResultCodeEnum.SUCCESS.getDesc());
         } catch (Exception e) {

src/main/resources/mapper/TbCfOptionDao.xml

@@ -28,6 +28,31 @@
 		where option_id = #{id}
 	</select>
 
+    <select id="queryByItemId" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOptionEntity">
+         select
+			`option_id`,
+			`option_name`,
+			`optiion_species`,
+			`item_id`,
+			`cid`,
+			`del_flag`,
+			`create_time`,
+			`update_time`
+		from tb_cf_option where item_id=#{itemId}
+    </select>
+
+    <select id="queryByCid" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOptionEntity">
+         select
+			`option_id`,
+			`option_name`,
+			`optiion_species`,
+			`item_id`,
+			`cid`,
+			`del_flag`,
+			`create_time`,
+			`update_time`
+		from tb_cf_option where cid=#{cid}
+    </select>
     <select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOptionEntity">
         select
         `option_id`,