zoujiajian 2 rokov pred
rodič
commit
8d47038349

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/views/YhShopGoodsFrontView.java

@@ -19,7 +19,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-@SearchBean(tables = "(select goods_id,min(price) as price from yh_shop_goods_sku where status is true and deleted is true :condition: group by goods_id) yg" +
+@SearchBean(tables = "(select ys.goods_id,min(ys.price) as price from yh_shop_goods_sku ys left join goods_don_sku sku on sku.id = ys.sku_id where sku.status is true and ys.status is true and ys.deleted is true :condition: group by ys.goods_id) yg" +
 		" inner join goods_don g on g.id = yg.goods_id",
 		where = "g.deleted is true and g.status is true and g.type = 1",
 		orderBy = "g.sort_by asc, g.id")

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/views/YhShopGoodsView.java

@@ -15,7 +15,7 @@ import java.util.List;
 @Data
 @SearchBean(tables = "yh_shop_goods_sku ysgs left join goods_don g on g.id = ysgs.goods_id" +
         " left join goods_don_sku sku on sku.id = ysgs.sku_id",
-        where = "g.status = true and g.deleted = true"
+        where = "g.status = true and g.deleted = true and sku.status is true"
         , groupBy = "g.id,g.title,g.category,ysgs.status,ysgs.user_id")
 public class YhShopGoodsView {
     @DbField("g.id")

+ 5 - 1
netflix-web/src/main/java/com/cyksj/web/controller/goods/GoodsDonController.java

@@ -291,7 +291,11 @@ public class GoodsDonController {
      * 获取商品详情
      */
     @GetMapping("/get/{id}")
-    public Result<GoodsDonViews> getDetail(@PathVariable Long id) {
+    public Result<? extends Object> getDetail(@PathVariable Long id, String customId) {
+        if (StrUtil.isNotBlank(customId)) {
+            Result<YhShopGoodsFrontView> yhShopGoodsDetail = getGoodsDetailByYhsId(id, yhShopFrontService.getYhsIdByCustomId(customId));
+            return yhShopGoodsDetail;
+        }
         Long fUid = StpUserUtil.getUserIdAfterLogin();
         GoodsDonViews views = beanSearcher.searchFirst(GoodsDonViews.class, MapUtils.builder().field(GoodsDonViews::getId, id).build());