From fa9b277b5def5b86710950852335d6c9962280ca Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Wed, 17 Sep 2025 14:56:14 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9Aapp=20=E6=88=91=E7=9A=84?= =?UTF-8?q?=E7=8C=9C=E4=BD=A0=E5=96=9C=E6=AC=A2=E8=B0=83=E6=95=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/own/APPOwnGuessLikeVO.java | 6 +++ .../app/own/APPOwnGuessLikeDTO.java | 8 +++- .../service/impl/WebsiteAPPServiceImpl.java | 39 +++++++++++-------- 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/app/own/APPOwnGuessLikeVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/app/own/APPOwnGuessLikeVO.java index 89d10dbe0..a3eb90b86 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/app/own/APPOwnGuessLikeVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/app/own/APPOwnGuessLikeVO.java @@ -26,6 +26,8 @@ public class APPOwnGuessLikeVO { private Long storeProdId; @ApiModelProperty(value = "档口ID") private Long storeId; + @ApiModelProperty(value = "档口名称") + private String storeName; @ApiModelProperty(value = "排序") private Integer orderNum; @ApiModelProperty(value = "商品货号") @@ -34,6 +36,10 @@ public class APPOwnGuessLikeVO { private BigDecimal price; @ApiModelProperty(value = "商品第一张主图路径") private String mainPicUrl; + @ApiModelProperty(value = "标题") + private String prodTitle; + @ApiModelProperty(value = "是否广告") + private Boolean advert; @ApiModelProperty(value = "是否有视频") private Boolean hasVideo; @ApiModelProperty(value = "标签列表") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/own/APPOwnGuessLikeDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/own/APPOwnGuessLikeDTO.java index cf144797f..31c92500a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/own/APPOwnGuessLikeDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/own/APPOwnGuessLikeDTO.java @@ -27,6 +27,8 @@ public class APPOwnGuessLikeDTO { private Long storeProdId; @ApiModelProperty(value = "档口ID") private Long storeId; + @ApiModelProperty(value = "档口名称") + private String storeName; @ApiModelProperty(value = "排序") private Integer orderNum; @ApiModelProperty(value = "售价") @@ -35,10 +37,12 @@ public class APPOwnGuessLikeDTO { private String prodArtNum; @ApiModelProperty(value = "商品第一张主图路径") private String mainPicUrl; + @ApiModelProperty(value = "标题") + private String prodTitle; + @ApiModelProperty(value = "是否广告") + private Boolean advert; @ApiModelProperty(value = "是否有视频") private Boolean hasVideo; - @ApiModelProperty(value = "商品标题") - private String prodTitle; @ApiModelProperty(value = "标签列表") private List tags; diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsiteAPPServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsiteAPPServiceImpl.java index 89a2cc4ee..cffeb7d28 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsiteAPPServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsiteAPPServiceImpl.java @@ -860,23 +860,10 @@ public class WebsiteAPPServiceImpl implements IWebsiteAPPService { appOwnGuessLikeList = expiredList.stream().filter(x -> StringUtils.isNotBlank(x.getProdIdStr())).map(x -> { final Long storeProdId = Long.parseLong(x.getProdIdStr()); StoreProdPriceAndMainPicAndTagDTO dto = attrMap.get(storeProdId); - return new APPOwnGuessLikeDTO().setDisplayType(AdDisplayType.PRODUCT.getValue()).setStoreProdId(storeProdId) - .setProdTitle(ObjectUtils.isNotEmpty(dto) ? dto.getProdTitle() : "").setStoreId(x.getStoreId()) - .setHasVideo(ObjectUtils.isNotEmpty(dto) ? dto.getHasVideo() : Boolean.FALSE) - .setTags(ObjectUtils.isNotEmpty(dto) ? dto.getTags() : null) - .setPrice(ObjectUtils.isNotEmpty(dto) ? dto.getMinPrice() : null) - .setProdArtNum(ObjectUtils.isNotEmpty(dto) ? dto.getProdArtNum() : "") - .setMainPicUrl(ObjectUtils.isNotEmpty(dto) ? dto.getMainPicUrl() : ""); - }).limit(20).collect(Collectors.toList()); - for (int i = 0; i < appOwnGuessLikeList.size(); i++) { - appOwnGuessLikeList.get(i).setOrderNum(i + 1); - } - } else { - appOwnGuessLikeList = launchingList.stream().filter(x -> StringUtils.isNotBlank(x.getProdIdStr())).map(x -> { - final Long storeProdId = Long.parseLong(x.getProdIdStr()); - StoreProdPriceAndMainPicAndTagDTO dto = attrMap.get(storeProdId); - return new APPOwnGuessLikeDTO().setDisplayType(AdDisplayType.PRODUCT.getValue()).setStoreProdId(storeProdId) - .setOrderNum(this.positionToNumber(x.getPosition())).setStoreId(x.getStoreId()) + return new APPOwnGuessLikeDTO().setDisplayType(AdDisplayType.PRODUCT.getValue()) + .setStoreId(x.getStoreId()).setStoreProdId(storeProdId).setAdvert(Boolean.TRUE) + .setStoreName(ObjectUtils.isNotEmpty(dto) ? dto.getStoreName() : "") + .setProdTitle(ObjectUtils.isNotEmpty(dto) ? dto.getProdTitle() : "") .setProdTitle(ObjectUtils.isNotEmpty(dto) ? dto.getProdTitle() : "") .setHasVideo(ObjectUtils.isNotEmpty(dto) ? dto.getHasVideo() : Boolean.FALSE) .setTags(ObjectUtils.isNotEmpty(dto) ? dto.getTags() : null) @@ -884,6 +871,24 @@ public class WebsiteAPPServiceImpl implements IWebsiteAPPService { .setProdArtNum(ObjectUtils.isNotEmpty(dto) ? dto.getProdArtNum() : "") .setMainPicUrl(ObjectUtils.isNotEmpty(dto) ? dto.getMainPicUrl() : ""); }).limit(20).collect(Collectors.toList()); + } else { + appOwnGuessLikeList = launchingList.stream().filter(x -> StringUtils.isNotBlank(x.getProdIdStr())).map(x -> { + final Long storeProdId = Long.parseLong(x.getProdIdStr()); + StoreProdPriceAndMainPicAndTagDTO dto = attrMap.get(storeProdId); + return new APPOwnGuessLikeDTO().setDisplayType(AdDisplayType.PRODUCT.getValue()) + .setStoreId(x.getStoreId()).setStoreProdId(storeProdId).setAdvert(Boolean.TRUE) + .setStoreName(ObjectUtils.isNotEmpty(dto) ? dto.getStoreName() : "") + .setProdTitle(ObjectUtils.isNotEmpty(dto) ? dto.getProdTitle() : "") + .setProdTitle(ObjectUtils.isNotEmpty(dto) ? dto.getProdTitle() : "") + .setHasVideo(ObjectUtils.isNotEmpty(dto) ? dto.getHasVideo() : Boolean.FALSE) + .setTags(ObjectUtils.isNotEmpty(dto) ? dto.getTags() : null) + .setPrice(ObjectUtils.isNotEmpty(dto) ? dto.getMinPrice() : null) + .setProdArtNum(ObjectUtils.isNotEmpty(dto) ? dto.getProdArtNum() : "") + .setMainPicUrl(ObjectUtils.isNotEmpty(dto) ? dto.getMainPicUrl() : ""); + }).limit(20).collect(Collectors.toList()); + } + for (int i = 0; i < appOwnGuessLikeList.size(); i++) { + appOwnGuessLikeList.get(i).setOrderNum(i + 1); } appOwnGuessLikeList.forEach(x -> { // 查询档口会员等级