商品收藏增加category 修复收藏不显示问题

yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java

@@ -12,6 +12,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import co.yixiang.api.ApiResult;
 import co.yixiang.api.YshopException;
+import co.yixiang.enums.ProductTypeEnum;
 import co.yixiang.modules.logging.aop.log.AppLog;
 import co.yixiang.common.bean.LocalUser;
 import co.yixiang.common.interceptor.AuthCheck;
@@ -98,7 +99,7 @@ public class StoreCombinationController {
         Long uid = LocalUser.getUser().getUid();
         StoreCombinationVo storeCombinationVo = storeCombinationService.getDetail(id,uid);
         storeCombinationVo.setUserCollect(relationService
-                .isProductRelation(storeCombinationVo.getStoreInfo().getProductId(),uid));
+                .isProductRelation(id,uid, ProductTypeEnum.COMBINATION.getValue()));
         return ApiResult.ok(storeCombinationVo);
     }
 

yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java

@@ -13,6 +13,7 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import co.yixiang.api.ApiResult;
 import co.yixiang.api.YshopException;
+import co.yixiang.enums.ProductTypeEnum;
 import co.yixiang.modules.logging.aop.log.AppLog;
 import co.yixiang.common.bean.LocalUser;
 import co.yixiang.common.interceptor.AuthCheck;
@@ -96,7 +97,7 @@ public class StoreSeckillController {
         Long uid = LocalUser.getUser().getUid();
         StoreSeckillVo storeSeckillVo = yxStoreSeckillService.getDetail(id);
         storeSeckillVo.setUserCollect(relationService
-                .isProductRelation(storeSeckillVo.getStoreInfo().getProductId(),uid));
+                .isProductRelation(id,uid, ProductTypeEnum.SECKILL.getValue()));
         return ApiResult.ok(storeSeckillVo);
     }
 

yshop-app/src/main/java/co/yixiang/modules/product/param/YxStoreProductRelationQueryParam.java

@@ -25,5 +25,8 @@ public class YxStoreProductRelationQueryParam  {
     private String id;
 
     @ApiModelProperty(value = "某种类型的商品(普通商品、秒杀商品)")
-    private String category = "root";
+    private String category;
+
+    @ApiModelProperty(value = "collect-收藏，foot-足迹")
+    private String type;
 }

yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java

@@ -238,7 +238,7 @@ public class StoreProductController {
         if(!NumberUtil.isNumber(param.getId())) {
             throw new YshopException("参数非法");
         }
-        productRelationService.addRroductRelation(Long.valueOf(param.getId()),uid,param.getCategory());
+        productRelationService.addRroductRelation(Long.valueOf(param.getId()),uid,param.getCategory(),param.getType());
         return ApiResult.ok();
     }
 
@@ -256,7 +256,7 @@ public class StoreProductController {
             throw new YshopException("参数非法");
         }
         productRelationService.delRroductRelation(Long.valueOf(param.getId()),
-                uid,param.getCategory());
+                uid,param.getCategory(),param.getType());
         return ApiResult.ok();
     }
 

yshop-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java

@@ -315,7 +315,8 @@ public class CreatShareProductService {
             File file = FileUtil.mkdir(new File(fileDir));
             if(AppFromEnum.ROUNTINE.getValue().equals(from)){
                 siteUrl = siteUrl+"/bargain/";
-                QrCodeUtil.generate(siteUrl+"?bargainId="+bargainId+"&uid="+uid+"&partake="+uid+"&pageType=dargain&codeType="+AppFromEnum.ROUNTINE.getValue(), 180, 180,
+                QrCodeUtil.generate(siteUrl+"?bargainId="+bargainId+"&uid="+uid+"&partake="+uid+"&pageType=dargain&codeType="+AppFromEnum.ROUNTINE.getValue(),
+                        180, 180,
                         FileUtil.file(fileDir+name));
             }
             else if(AppFromEnum.APP.getValue().equals(from)){

yshop-app/src/main/resources/config/application-dev.yml

@@ -5,9 +5,9 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://localhost:3306/yshopb2c?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+        url: jdbc:mysql://localhost:3306/b2x-boot-online?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
         username: root
-        password: 123456
+        password: root
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
@@ -83,8 +83,8 @@ swagger:
 
 # 文件存储路径
 file:
-  path: D:\yshop\file\
-  avatar: D:\yshop\avatar\
+  path: /Users/hupeng/hupeng/file/
+  avatar: /Users/hupeng/hupeng/file/
   # 文件大小 /M
   maxSize: 100
   avatarMaxSize: 5

yshop-app/src/main/resources/config/application-prod.yml

@@ -7,7 +7,7 @@ spring:
       master:
         url: jdbc:mysql://localhost:3306/yshopb2c?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull
         username: yshopb2c
-        password: bkfGfAimifjPZtNE
+        password: YAimJWfpMar6dwpm
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
@@ -50,7 +50,7 @@ spring:
     host: 127.0.0.1 # Redis服务器地址
     database: 5 # Redis数据库索引（默认为0）
     port: 6379 # Redis服务器连接端口
-    password: # Redis服务器连接密码（默认为空）
+    password: yshop2019@yxtw # Redis服务器连接密码（默认为空）
     jedis:
       pool:
         max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
@@ -69,7 +69,7 @@ single:
 yshop:
   security:
     jwt-key: yshopmini
-    token-expired-in: 72000
+    token-expired-in: 7200000
 
 
 

yshop-app/src/main/resources/config/application.yml

@@ -53,6 +53,7 @@ mybatis-plus:
   check-config-location: true
   configuration:
     map-underscore-to-camel-case: true
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   global-config:
     db-config:
       id-type: auto