Browse Source

fix 礼品卡状态

zoujiajian 1 năm trước cách đây
mục cha
commit
7d9358f401

+ 3 - 2
netflix-dao/src/main/java/com/cyksj/model/views/GiftCardGoodsSkuFrontView.java

@@ -17,9 +17,10 @@ import java.math.BigDecimal;
  */
 @Getter
 @Setter
-@SearchBean(tables = "gift_card_goods_sku gc left join goods_don g on g.id = gc.gc_goods_id" +
+@SearchBean(tables = "gift_card_goods_sku gc inner join goods_don gcd on gcd.id = gc.goods_id" +
+		" left join goods_don g on g.id = gc.gc_goods_id" +
 		" left join goods_don_sku sku on sku.id = gc.gc_sku_id",
-		where = "gc.status is true and gc.deleted is true")
+		where = "gcd.status is true and gc.status is true and gc.deleted is true")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class GiftCardGoodsSkuFrontView {
 	@DbField("gc.id")

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

@@ -359,7 +359,7 @@ public class GoodsDonController {
 			GoodsFrontListView views = beanSearcher.searchFirst(GoodsFrontListView.class, MapUtils.builder().field(GoodsFrontListView::getId, id)
 					.build());
 			if (views == null) {
-				throw BusinessRuntimeException.getInstance("商品已下架..");
+				return GatewayResponse.SUCCESS.newBuilder().toResult();
 			}
 
 			views.setSpecs(beanSearcher.searchFirst(GoodsDonSpecFrontView.class, MapUtils.builder().field(GoodsDonSpecFrontView::getGoodsId, views.getId()).build()));