zoujiajian 1 year ago
parent
commit
5a8fa92faf

+ 0 - 3
netflix-dao/src/main/java/com/cyksj/model/views/GoodsDonSkuFrontView.java

@@ -158,7 +158,4 @@ public class GoodsDonSkuFrontView {
 	private Integer lumaNum;
 
 	private String remark;
-
-	@DbIgnore
-	private Boolean isGiftSku = false;
 }

+ 6 - 0
netflix-dao/src/main/java/com/cyksj/model/views/GoodsFrontListView.java

@@ -166,4 +166,10 @@ public class GoodsFrontListView {
 
 	@DbIgnore
 	private List<GoodsDonQaFrontView> questions;
+
+	/**
+	 * 是否是礼品卡平台
+	 */
+	@DbIgnore
+	private Boolean isGift = false;
 }

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

@@ -383,9 +383,10 @@ public class GoodsDonController {
 			UserSharedDto userSharedDto = userService.getUserShredDtoByDsCode(dsCode);
 			dsUserId.set(userSharedDto.getSharedId());
 		}
-		List<Long> giftSkuIds = giftCardGoodsSkuMapper.selectList(Wrappers.lambdaQuery(GiftCardGoodsSku.class)
+		views.setIsGift(giftCardGoodsSkuMapper.selectCount(Wrappers.lambdaQuery(GiftCardGoodsSku.class)
+				.eq(GiftCardGoodsSku::getGoodsId, views.getId())
 				.eq(GiftCardGoodsSku::getStatus, 1)
-				.eq(GiftCardGoodsSku::getDeleted, 1)).stream().map(GiftCardGoodsSku::getGcSkuId).collect(Collectors.toList());
+				.eq(GiftCardGoodsSku::getDeleted, 1)) > 0);
 		views.setSkuList(views.getSkuList().stream().filter(sku -> {
 			if (StrUtil.isNotBlank(sku.getUserOwns())) {
 				if (dsUserId.get() == 0 && fUid != null && existsChannel.get()) {
@@ -399,9 +400,6 @@ public class GoodsDonController {
 					return false;
 				}
 			}
-			if (CollUtil.isNotEmpty(giftSkuIds) && giftSkuIds.contains(sku.getId())) {
-				sku.setIsGiftSku(true);
-			}
 			if (sku.getIsDp()) {
 				sku.setDpSkuViews(beanSearcher.searchAll(GoodsDiscountPlusPurchaseRelationFrontView.class, MapUtils.builder()
 						.field(GoodsDiscountPlusPurchaseRelationFrontView::getSkuId, sku.getId())