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 { - @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")