From 346f7257586a3bbd1865029ba526408f1c7a8c83 Mon Sep 17 00:00:00 2001
From: "LIONCITYS\\lioncity" <18026623439@163.com>
Date: Fri, 6 Nov 2020 17:41:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81=E6=94=B6?=
 =?UTF-8?q?=E8=97=8F=E5=90=8E=E6=97=A0=E6=B3=95=E5=8F=96=E6=B6=88,?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=96=E6=B6=88=E5=90=8E=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=94=B6=E8=97=8F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/3.0升级3.1sql.sql                                        | 5 +++++
 .../yixiang/modules/product/rest/StoreProductController.java | 2 +-
 .../product/service/YxStoreProductRelationService.java       | 2 +-
 .../service/impl/YxStoreProductRelationServiceImpl.java      | 5 +++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sql/3.0升级3.1sql.sql b/sql/3.0升级3.1sql.sql
index d0c3b04f..bafcc8e2 100644
--- a/sql/3.0升级3.1sql.sql
+++ b/sql/3.0升级3.1sql.sql
@@ -129,3 +129,8 @@ CREATE TABLE `yx_wechat_live_goods`  (
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '微信直播商品表' ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
+
+
+
+
+drop index uid on yx_store_product_relation;
\ No newline at end of file
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 1a1904ed..abaf185a 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
@@ -236,7 +236,7 @@ public class StoreProductController {
         if(!NumberUtil.isNumber(param.getId())) {
             throw new YshopException("参数非法");
         }
-        productRelationService.addRroductRelation(Long.valueOf(param.getId()),uid);
+        productRelationService.addRroductRelation(Long.valueOf(param.getId()),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 448bb9ba..485deef7 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
@@ -43,7 +43,7 @@ public interface YxStoreProductRelationService extends BaseService<YxStoreProduc
      * @param productId 商品id
      * @param uid 用户id
      */
-    void addRroductRelation(long productId,long uid);
+    void addRroductRelation(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 d73db9d3..b1342dba 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
@@ -78,12 +78,13 @@ public class YxStoreProductRelationServiceImpl extends BaseServiceImpl<YxStorePr
      * @param uid 用户id
      */
     @Override
-    public void addRroductRelation(long productId,long uid) {
+    public void addRroductRelation(long productId,long uid,String category) {
         if(isProductRelation(productId,uid)) {
             throw new YshopException("已收藏");
         }
         YxStoreProductRelation storeProductRelation = YxStoreProductRelation.builder()
                 .productId(productId)
+                .category(category)
                 .uid(uid)
                 .type("collect")
                 .build();
@@ -100,7 +101,7 @@ public class YxStoreProductRelationServiceImpl extends BaseServiceImpl<YxStorePr
         YxStoreProductRelation productRelation = this.lambdaQuery()
                 .eq(YxStoreProductRelation::getProductId,productId)
                 .eq(YxStoreProductRelation::getUid,uid)
-                .eq(YxStoreProductRelation::getType,category)
+                .eq(YxStoreProductRelation::getCategory,category)
                 .one();
         if(productRelation == null) {
             throw new YshopException("已取消");