价格排序，收藏标识，不能重复收藏，加评论ID

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

@@ -84,10 +84,11 @@ public class TbCfStationItemController {
      * @return
      */
     @ApiOperation("商品搜索")
-    @GetMapping("/searchItems/{name}")
-    public Result searchItems(@ApiParam(value = "名字") @PathVariable("name") String name) {
+    @GetMapping("/searchItems")
+    public Result searchItems(@ApiParam(value = "名字") @RequestParam(value = "name") String name,
+                              @ApiParam(value = "名字") @RequestParam(value = "order", required = false) String order) {
 
-        return tbCfStationItemService.searchItems(name);
+        return tbCfStationItemService.searchItems(name, order);
     }
 
     /**

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

 package com.diaoyun.zion.chinafrica.dao;
 
 import com.diaoyun.zion.chinafrica.entity.TbCfItemCollectionEntity;
+import com.diaoyun.zion.chinafrica.entity.TbCfItemCommentEntity;
+import com.diaoyun.zion.chinafrica.entity.TbCfStationItemEntity;
 import com.diaoyun.zion.master.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,7 +17,7 @@ import java.util.List;
  */
 public interface TbCfItemCollectionDao extends BaseDao<TbCfItemCollectionEntity> {
 
-    List<String> queryCollectionByUserId(String userId);
-
+    List<TbCfItemCollectionEntity> queryCollectionByUserId(String userId);
+    TbCfItemCollectionEntity queryIsCollection(@Param("userId")String userId, @Param("itemId") String itemId);
 
 }

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

@@ -4,6 +4,7 @@ package com.diaoyun.zion.chinafrica.dao;
 import com.diaoyun.zion.chinafrica.entity.TbCfItemCommentEntity;
 import com.diaoyun.zion.chinafrica.entity.TbCfItemCommentEntityExtends;
 import com.diaoyun.zion.master.dao.BaseDao;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -20,4 +21,6 @@ public interface TbCfItemCommentDao extends BaseDao<TbCfItemCommentEntity> {
     List<TbCfItemCommentEntity> querycomments(String itemId);
 
     List<TbCfItemCommentEntity> queryScore(String itemId);
+
+
 }

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

@@ -4,6 +4,7 @@ import com.diaoyun.zion.chinafrica.entity.TbCfPlatformEntity;
 import com.diaoyun.zion.chinafrica.entity.TbCfStationItemEntity;
 import com.diaoyun.zion.master.base.Result;
 import com.diaoyun.zion.master.dao.BaseDao;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -35,7 +36,7 @@ public interface TbCfStationItemDao extends BaseDao<TbCfStationItemEntity> {
      * @param name
      * @return
      */
-    List<TbCfStationItemEntity> searchItems(String name);
+    List<TbCfStationItemEntity> searchItems(@Param("name") String name, @Param("order")String order);
 
 
     /**

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

@@ -37,6 +37,15 @@ public class TbCfItemCollectionEntity implements Serializable {
      * 更新时间
      */
     private Date updateTime;
+    private TbCfStationItemEntity item;
+
+    public TbCfStationItemEntity getItem() {
+        return item;
+    }
+
+    public void setItem(TbCfStationItemEntity item) {
+        this.item = item;
+    }
 
     /**
      * 设置：ID

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

@@ -68,6 +68,7 @@ public class TbCfItemCommentEntity implements Serializable {
 
     private String username;
 
+
     public String getUsername() {
         return username;
     }

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

@@ -14,6 +14,7 @@ import java.util.Date;
 public class TbCfStationItemEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
+
     /**
      * 商品id
      */

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

@@ -109,7 +109,7 @@ public interface TbCfStationItemService {
      * @param name
      * @return
      */
-    Result searchItems(String name);
+    Result searchItems(String name,String order);
 
     /**
      * 查询一级分类的二级类目

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

@@ -172,7 +172,7 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
                 int num = 4 * itemCommentList.size();
                 BigDecimal to = new BigDecimal(totalScore);
                 BigDecimal count = new BigDecimal(num);
-                score = to.divide(count,1,BigDecimal.ROUND_UP).doubleValue();
+                score = to.divide(count, 1, BigDecimal.ROUND_UP).doubleValue();
             }
 
             //商品sku
@@ -225,10 +225,10 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
      * @return
      */
     @Override
-    public Result searchItems(String name) {
+    public Result searchItems(String name, String order) {
         Result result = new Result();
         try {
-            List<TbCfStationItemEntity> itemList = tbCfStationItemDao.searchItems(name.trim());
+            List<TbCfStationItemEntity> itemList = tbCfStationItemDao.searchItems(name.trim(), order);
             result.setData(itemList).setMessage(ResultCodeEnum.SUCCESS.getDesc());
         } catch (Exception e) {
             result.setCode(ResultCodeEnum.QUERY_ERROR.getCode()).setMessage(e.getMessage());
@@ -300,25 +300,35 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
     @Override
     public Result itemCollection(String userId, String itemId) {
         Result result = new Result();
+        Map map = new HashMap();
+        boolean collection = false;
         try {
-            TbCfStationItemEntity item = tbCfStationItemDao.queryObject(itemId);
-            if (item != null) {
-                Long count = item.getItemCollectionNum();
-                if (null == count) {
-                    count = 0L;
+            TbCfItemCollectionEntity isCollection = tbCfItemCollectionDao.queryIsCollection(userId, itemId);
+            if (isCollection != null) {
+                collection = true;
+                result.setMessage(ResultCodeEnum.SUCCESS.getDesc());
+            } else {
+                TbCfStationItemEntity item = tbCfStationItemDao.queryObject(itemId);
+                if (item != null) {
+                    Long count = item.getItemCollectionNum();
+                    if (null == count) {
+                        count = 0L;
+                    }
+                    item.setItemCollectionNum(++count);
+                    tbCfStationItemDao.update(item);
                 }
-                item.setItemCollectionNum(++count);
-                tbCfStationItemDao.update(item);
+                TbCfItemCollectionEntity collectionEntity = new TbCfItemCollectionEntity();
+                collectionEntity.setId(IdUtil.createIdbyUUID());
+                collectionEntity.setUserId(userId);
+                collectionEntity.setItemId(itemId);
+                collectionEntity.setDelFlag(1);
+                collectionEntity.setCreateTime(new Date());
+                collectionEntity.setUpdateTime(new Date());
+                tbCfItemCollectionDao.save(collectionEntity);
+                result.setMessage("Collection of success!");
             }
-            TbCfItemCollectionEntity collectionEntity = new TbCfItemCollectionEntity();
-            collectionEntity.setId(IdUtil.createIdbyUUID());
-            collectionEntity.setUserId(userId);
-            collectionEntity.setItemId(itemId);
-            collectionEntity.setDelFlag(1);
-            collectionEntity.setCreateTime(new Date());
-            collectionEntity.setUpdateTime(new Date());
-            tbCfItemCollectionDao.save(collectionEntity);
-            result.setMessage("Collection of success!");
+            map.put("isCollection", collection);
+            result.setData(map);
         } catch (Exception e) {
             result.setCode(ResultCodeEnum.QUERY_ERROR.getCode()).setMessage(e.getMessage());
         }
@@ -336,13 +346,16 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
         Result result = new Result();
         Map<String, Object> map = new HashMap<>();
         try {
-            List<String> itemIds = tbCfItemCollectionDao.queryCollectionByUserId(userId);
-            List<TbCfStationItemEntity> itemList = new ArrayList<>();
-            for (String item : itemIds) {
-                TbCfStationItemEntity itemEntity = tbCfStationItemDao.queryObject(item);
-                itemList.add(itemEntity);
+            List<TbCfItemCollectionEntity> itemCollectionList = tbCfItemCollectionDao.queryCollectionByUserId(userId);
+            List<TbCfItemCollectionEntity> list = new ArrayList<>();
+            for (TbCfItemCollectionEntity collection : itemCollectionList) {
+                TbCfItemCollectionEntity itemCollectionEntity = new TbCfItemCollectionEntity();
+                itemCollectionEntity.setId(collection.getId());
+                TbCfStationItemEntity item = tbCfStationItemDao.queryObject(collection.getItemId());
+                itemCollectionEntity.setItem(item);
+                list.add(itemCollectionEntity);
             }
-            map.put("collectionItems", itemList);
+            map.put("collectionItems", list);
             result.setData(map).setMessage(ResultCodeEnum.SUCCESS.getDesc());
         } catch (Exception e) {
             result.setCode(ResultCodeEnum.QUERY_ERROR.getCode()).setMessage(e.getMessage());

src/main/resources/mapper/TbCfItemCollectionDao.xml

@@ -23,7 +23,17 @@
 		from tb_cf_item_collection
 		where id = #{id}
 	</select>
-
+    <select id="queryIsCollection" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemCollectionEntity">
+         select
+			`id`,
+			`user_id`,
+			`item_id`,
+			`del_flag`,
+			`create_time`,
+			`update_time`
+		from tb_cf_item_collection
+        WHERE user_id=#{userId} and item_id=#{itemId}
+    </select>
     <select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemCollectionEntity">
         select
         `id`,
@@ -49,11 +59,9 @@
             limit #{offset}, #{limit}
         </if>
     </select>
-    <select id="queryCollectionByUserId" resultType="string">
-        select
-    	item_id
-		from tb_cf_item_collection
-		where user_id=#{userId}
+    <select id="queryCollectionByUserId" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemCollectionEntity">
+       select * from tb_cf_item_collection c left join tb_cf_station_item i on c.item_id=i.item_id
+	   where user_id=#{userId}
     </select>
     <select id="queryTotal" resultType="int">
         select count(*) from tb_cf_item_collection

src/main/resources/mapper/TbCfItemCommentDao.xml

@@ -117,6 +117,8 @@
         </if>
     </select>
 
+
+
     <select id="queryTotal" resultType="int">
         select count(*) from tb_cf_item_comment
         WHERE 1=1

src/main/resources/mapper/TbCfStationItemDao.xml

@@ -188,27 +188,6 @@
         order by item_num desc
 
     </select>
-    <select id="searchItems" resultType="com.diaoyun.zion.chinafrica.entity.TbCfStationItemEntity">
-		select
-			`item_id`,
-    		`item_code`,
-    		`item_name`,
-    		`item_brief`,
-    		`item_category`,
-    		`item_price`,
-    		`discount_price`,
-    		`item_url`,
-    		`item_img`,
-    		`item_num`,
-    		`item_count`,
-    		`platform_code`,
-    		`platform_name`,
-    		`enable_flag`,
-    		`create_time`,
-    		`item_categorytwo`,
-    		`item_descrition_id`
-		from tb_cf_station_item where item_name like concat('%',#{name},'%') or item_brief like concat('%',#{name},'%') or item_tags like concat('%',#{name},'%')
-	</select>
     <select id="getGoodsTypeList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfStationItemEntity">
 		select
 			`item_id`,
@@ -231,6 +210,31 @@
 		from tb_cf_station_item
 		where enable_flag=1 and item_category = #{categoryId} order by item_num desc limit 0,4
 	</select>
+    <select id="searchItems" resultType="com.diaoyun.zion.chinafrica.entity.TbCfStationItemEntity">
+        select
+        `item_id`,
+        `item_code`,
+        `item_name`,
+        `item_brief`,
+        `item_category`,
+        `item_price`,
+        `discount_price`,
+        `item_url`,
+        `item_img`,
+        `item_num`,
+        `item_count`,
+        `platform_code`,
+        `platform_name`,
+        `enable_flag`,
+        `create_time`,
+        `item_categorytwo`,
+        `item_descrition_id`
+        from tb_cf_station_item where enable_flag=1 and item_name like concat('%',#{name},'%') or item_brief like concat('%',#{name},'%')
+        or item_tags like concat('%',#{name},'%')
+        <if test="order != null ">
+            order by item_price ${order}
+        </if>
+    </select>
     <select id="queryItemByDescription" resultType="com.diaoyun.zion.chinafrica.entity.TbCfStationItemEntity">
 		select
 			`item_id`,