From 9291c18329c9f558752d87254dbbe95ac9eb658f Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Thu, 17 Sep 2020 11:39:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B6=B3=E8=BF=B9=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E5=88=A0=E9=99=A4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/param/YxStoreProductRelationQueryParam.java       | 2 +-
 .../yixiang/modules/product/rest/StoreProductController.java  | 2 +-
 .../product/service/YxStoreProductRelationService.java        | 2 +-
 .../service/impl/YxStoreProductRelationServiceImpl.java       | 4 ++--
 .../product/service/mapper/YxStoreProductRelationMapper.java  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/yshop-app/src/main/java/co/yixiang/modules/product/param/YxStoreProductRelationQueryParam.java b/yshop-app/src/main/java/co/yixiang/modules/product/param/YxStoreProductRelationQueryParam.java
index 6fc22a32..77f9202a 100644
--- a/yshop-app/src/main/java/co/yixiang/modules/product/param/YxStoreProductRelationQueryParam.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/product/param/YxStoreProductRelationQueryParam.java
@@ -25,5 +25,5 @@ public class YxStoreProductRelationQueryParam  {
     private String id;
 
     @ApiModelProperty(value = "某种类型的商品(普通商品、秒杀商品)")
-    private String category;
+    private String category = "root";
 }
diff --git a/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java b/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java
index 96113c7d..5ff459c1 100644
--- a/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java
@@ -251,7 +251,7 @@ public class StoreProductController {
             throw new YshopException("参数非法");
         }
         productRelationService.delRroductRelation(Long.valueOf(param.getId()),
-                uid);
+                uid,param.getCategory());
         return ApiResult.ok();
     }
 
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/YxStoreProductRelationService.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/YxStoreProductRelationService.java
index 8638f14d..448bb9ba 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/YxStoreProductRelationService.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/YxStoreProductRelationService.java
@@ -50,7 +50,7 @@ public interface YxStoreProductRelationService extends BaseService<YxStoreProduc
      * @param productId 商品id
      * @param uid 用户id
      */
-    void delRroductRelation(long productId,long uid);
+    void delRroductRelation(long productId,long uid,String category);
 
     /**
      * 获取用户收藏列表
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductRelationServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductRelationServiceImpl.java
index 50984aa4..d73db9d3 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductRelationServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductRelationServiceImpl.java
@@ -96,11 +96,11 @@ public class YxStoreProductRelationServiceImpl extends BaseServiceImpl<YxStorePr
      * @param uid 用户id
      */
     @Override
-    public void delRroductRelation(long productId,long uid) {
+    public void delRroductRelation(long productId,long uid,String category) {
         YxStoreProductRelation productRelation = this.lambdaQuery()
                 .eq(YxStoreProductRelation::getProductId,productId)
                 .eq(YxStoreProductRelation::getUid,uid)
-                .eq(YxStoreProductRelation::getType,"collect")
+                .eq(YxStoreProductRelation::getType,category)
                 .one();
         if(productRelation == null) {
             throw new YshopException("已取消");
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/mapper/YxStoreProductRelationMapper.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/mapper/YxStoreProductRelationMapper.java
index 64aafb77..7d8a1209 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/mapper/YxStoreProductRelationMapper.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/mapper/YxStoreProductRelationMapper.java
@@ -30,7 +30,7 @@ import java.util.List;
 @Repository
 public interface YxStoreProductRelationMapper extends CoreMapper<YxStoreProductRelation> {
 
-    @Select("select B.id pid,A.category,B.store_name as storeName,B.price," +
+    @Select("select B.id pid,A.type as category,B.store_name as storeName,B.price," +
             "B.ot_price as otPrice,B.sales,B.image,B.is_show as isShow" +
             " from yx_store_product_relation A left join yx_store_product B " +
             "on A.product_id = B.id where A.type=#{type} and A.uid=#{uid} and A.is_del = 0 and B.is_del = 0 order by A.create_time desc")