Merge branch 'dev' of http://42.193.1.25:9521/r/lmk-shop-java into dev

zhanghua

2025-07-02 dc249113553d081aaa26d4d1f3718b5514363131

Merge branch 'dev' of http://42.193.1.25:9521/r/lmk-shop-java into dev

 buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java

@@ -142,4 +142,10 @@
    public Result changeThumbsUp(@RequestBody @Validated(Add.class) ThumbsUpRecordForm form) {
        return videoService.changeThumbsUp(form);
    }

    @GetMapping("/es/search")
    @ApiOperation(value = "视频搜索", notes = "视频搜索")
    public Result esSearch(VideoEsQuery query) {
        return videoService.esSearch(query);
    }
}

 consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java

@@ -406,6 +406,8 @@
        }
        goodsIndex.setAuthFlag(goods.getAuthFlag());
        goodsIndex.setMarketEnable(goods.getMarketEnable());
        goodsIndex.setPreSaleBeginDate(goods.getPreSaleBeginDate());
        goodsIndex.setPreSaleEndDate(goods.getPreSaleEndDate());
        this.settingUpGoodsIndexOtherParam(goodsIndex);
        return goodsIndex;
    }

 framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java

@@ -168,6 +168,14 @@
                        "        \"type\": \"date\",\n" +
                        "        \"format\": \"yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis\"\n" +
                        "      },\n" +
                        "      \"preSaleEndDate\": {\n" +
                        "        \"type\": \"date\",\n" +
                        "        \"format\": \"yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis\"\n" +
                        "      },\n" +
                        "      \"preSaleBeginDate\": {\n" +
                        "        \"type\": \"date\",\n" +
                        "        \"format\": \"yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis\"\n" +
                        "      },\n" +
                        "      \"categoryPath\": {\n" +
                        "        \"type\": \"text\",\n" +
                        "        \"fielddata\": true,\n" +

 framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java

@@ -17,17 +17,21 @@
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xkcoding.http.util.StringUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import org.springframework.format.annotation.DateTimeFormat;

import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
import java.util.Map;

/**
@@ -157,7 +161,17 @@
    @ApiModelProperty(value = "商品参数json", hidden = true)
    private String params;

    @ApiModelProperty(value = "预售结束时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date preSaleEndDate;

    @ApiModelProperty(value = "预售开始时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date preSaleBeginDate;
    @ApiModelProperty(value = "抽成比例")
    private BigDecimal commission;
    public Goods() {
    }

@@ -175,6 +189,9 @@
        this.mobileIntro = goodsOperationDTO.getMobileIntro();
        this.goodsVideo = goodsOperationDTO.getGoodsVideo();
        this.price = goodsOperationDTO.getPrice();
        this.preSaleEndDate = goodsOperationDTO.getPreSaleEndDate();
        this.preSaleBeginDate = goodsOperationDTO.getPreSaleBeginDate();
        this.commission =  goodsOperationDTO.getCommission();
        if (goodsOperationDTO.getGoodsParamsDTOList() != null && goodsOperationDTO.getGoodsParamsDTOList().isEmpty()) {
            this.params = JSONUtil.toJsonStr(goodsOperationDTO.getGoodsParamsDTOList());
        }

 framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java

@@ -3,17 +3,17 @@
import cn.lili.common.validation.EnumValue;
import cn.lili.modules.goods.entity.enums.GoodsSalesModeEnum;
import cn.lili.modules.goods.entity.enums.GoodsTypeEnum;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import org.hibernate.validator.constraints.Length;
import org.springframework.format.annotation.DateTimeFormat;

import javax.validation.Valid;
import javax.validation.constraints.*;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.math.BigDecimal;
import java.util.*;

/**
 * 商品操作DTO
@@ -141,6 +141,22 @@
    @ApiModelProperty(value = "浏览权限")
    private String browsePermissions;


    @ApiModelProperty(value = "预售结束时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date preSaleEndDate;

    @ApiModelProperty(value = "预售开始时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date preSaleBeginDate;

    @ApiModelProperty(value = "抽成比例")
    @DecimalMax(value = "100",message = "抽成比例必须小于100")
    @DecimalMin(value = "0",message = "抽成比例必须大于0")
    private BigDecimal commission;

    public String getGoodsName() {
        //对商品对名称做一个极限处理。这里没有用xss过滤是因为xss过滤为全局过滤，影响很大。
        // 业务中，全局代码中只有商品名称不能拥有英文逗号，是由于商品名称存在一个数据库联合查询，结果要根据逗号分组

 framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuDTO.java

@@ -1,11 +1,15 @@
package cn.lili.modules.goods.entity.dto;

import cn.lili.modules.goods.entity.dos.GoodsSku;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

/**
 * @author paulG
@@ -22,4 +26,16 @@
    @ApiModelProperty(value = "商品参数json")
    private String params;


    @ApiModelProperty(value = "预售结束时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date preSaleEndDate;

    @ApiModelProperty(value = "预售开始时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date preSaleBeginDate;


}

 framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsSalesModeEnum.java

@@ -9,6 +9,7 @@
public enum GoodsSalesModeEnum {

    RETAIL("零售"),
    PRESALE("预售"),
    WHOLESALE("批发");

    private final String description;

 framework/src/main/java/cn/lili/modules/goods/mapper/GoodsSkuMapper.java

@@ -114,7 +114,7 @@
     * @param queryWrapper 查询条件
     * @return 售后VO分页
     */
    @Select("SELECT *,g.params as params FROM li_goods_sku gs inner join li_goods g on gs.goods_id = g.id ${ew.customSqlSegment}")
    @Select("SELECT *,g.params as params,g.pre_sale_end_date,g.pre_sale_begin_date FROM li_goods_sku gs inner join li_goods g on gs.goods_id = g.id ${ew.customSqlSegment}")
    IPage<GoodsSkuDTO> queryByParams(IPage<GoodsSkuDTO> page, @Param(Constants.WRAPPER) Wrapper<GoodsSkuDTO> queryWrapper);

    @Select("SELECT id as sku_id, quantity, goods_id,simple_specs,sn,goods_name FROM li_goods_sku ${ew.customSqlSegment}")

 framework/src/main/java/cn/lili/modules/lmk/domain/es/VideoIndex.java

@@ -9,6 +9,7 @@
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;

import java.util.Date;
import java.util.List;

/**
@@ -91,4 +92,19 @@
    @Field(type = FieldType.Keyword)
    private boolean recommend = false;

    /** 视频收藏数 */
    @Field(type = FieldType.Integer)
    private Integer collectNum;

    /** 视频点赞数 */
    @Field(type = FieldType.Integer)
    private Integer thumbsUpNum;

    /** 视频评论数 */
    @Field(type = FieldType.Integer)
    private Integer commentNum;

    /** 视频发布时间（审核通过时间） */
    @Field(type = FieldType.Date)
    private Date publishTime;
}

 framework/src/main/java/cn/lili/modules/lmk/domain/query/VideoEsQuery.java

New file
@@ -0,0 +1,24 @@
package cn.lili.modules.lmk.domain.query;

import cn.lili.base.AbsQuery;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author：xp
 * @date：2025/7/2 10:08
 */
@Data
@ApiModel("视频搜索")
public class VideoEsQuery {

    @ApiModelProperty("关键词")
    private String keyword;

    @ApiModelProperty(value = "当前页", required = true)
    private int pageNumber = 0;

    @ApiModelProperty(value = "每页条数", required = true)
    private int pageSize = 10;
}

 framework/src/main/java/cn/lili/modules/lmk/domain/query/VideoQuery.java

@@ -32,5 +32,8 @@
     */
    @ApiModelProperty("视频类型：视频、大健康、神厨，默认不传查视频")
    private String videoType = VideoTypeEnum.VIDEO.getValue();

    @ApiModelProperty("搜索视频的关键词")
    private String keyword;
}


 framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java

@@ -290,4 +290,11 @@
     */
    void updateThumbsUpNumBatch(List<CollectTypeNumVO> numList);

    /**
     * 视频搜索-es
     *
     * @param query
     * @return
     */
    Result esSearch(VideoEsQuery query);
}

 framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java

@@ -18,6 +18,7 @@
import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.service.FootprintService;
import cn.lili.modules.member.service.MemberService;
import cn.lili.modules.search.entity.dos.EsGoodsIndex;
import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
import cn.lili.rocketmq.tags.CommentTagsEnum;
import cn.lili.rocketmq.tags.VideoTagsEnum;
@@ -33,8 +34,18 @@
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.lucene.search.join.ScoreMode;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.elasticsearch.index.query.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
import org.springframework.data.elasticsearch.core.SearchHits;
import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
import cn.lili.utils.PageUtil;
@@ -74,6 +85,10 @@
    private final RocketmqCustomProperties rocketmqCustomProperties;
    private final RocketMQTemplate rocketMQTemplate;
    private final ThumbsUpRecordService thumbsUpRecordService;
    private final ElasticsearchOperations restTemplate;

    @Qualifier("videoEsServiceImpl")
    private final EsService esService;


    /**
@@ -219,6 +234,8 @@
        // 5. 构建es中数据，mq异步处理
        VideoIndex videoIndex = new VideoIndex();
        BeanUtils.copyProperties(video, videoIndex);
        videoIndex.setAuthorName(UserContext.getCurrentUser().getNickName());
        videoIndex.setAuthorAvatar(UserContext.getCurrentUser().getFace());
        videoIndex.setCoverFileKey(video.getCoverUrl());
        List<VideoGoodsDetailVO> esGoodsList = videoGoods.stream().map(goods -> {
            VideoGoodsDetailVO vo = new VideoGoodsDetailVO();
@@ -302,6 +319,8 @@
        // 5. 更新es中的数据，mq异步处理
        VideoIndex videoIndex = new VideoIndex();
        BeanUtils.copyProperties(video, videoIndex);
        videoIndex.setAuthorName(UserContext.getCurrentUser().getNickName());
        videoIndex.setAuthorAvatar(UserContext.getCurrentUser().getFace());
        videoIndex.setCoverFileKey(video.getCoverUrl());
        List<VideoGoodsDetailVO> esGoodsList = videoGoods.stream().map(goods -> {
            VideoGoodsDetailVO vo = new VideoGoodsDetailVO();
@@ -451,23 +470,33 @@
        // 推荐算法： 1. 根据用户的收藏视频的标签  2. 根据用户关注的作者的其它视频  3. 根据用户的观看记录（观看时长较长的、重复观看次数较多的） 4. 基于相似用户的观看行为来给该用户推荐
        IPage<WxVideoVO> page = PageUtil.getPage(query, WxVideoVO.class);
        switch (query.getVideoFrom()) {
            case "recommend":
            case "recommend":// 加载推荐视频
                baseMapper.recommendVideo(page, query);
                break;
            case "author":
            case "author":  // 加载视频主页我发布的视频
                AuthorVideoQuery query1 = new AuthorVideoQuery();
                BeanUtils.copyProperties(query, query1);
                query1.setAuthorId(query.getAuthorId());
                baseMapper.getAuthorVideoPage(page, query1);
                break;
            case "collect":
            case "collect": // 加载视频主页收藏视频
                AuthorVideoQuery query2 = new AuthorVideoQuery();
                BeanUtils.copyProperties(query, query2);
                query2.setAuthorId(query.getAuthorId());
                baseMapper.getAuthorCollectVideoPage(page, query2);
                break;
            case "like":
            case "like":    // 加载视频主页点赞视频
                AuthorVideoQuery query3 = new AuthorVideoQuery();
                BeanUtils.copyProperties(query, query3);
                query3.setAuthorId(query.getAuthorId());
                baseMapper.getAuthorLikeVideoPage(page, query3);
                break;
            case "search":  // 加载es搜索视频
                VideoEsQuery query4 = new VideoEsQuery();
                BeanUtils.copyProperties(query, query4);
                query4.setPageNumber((int) query.getPageNumber());
                query4.setPageSize((int) query.getPageSize());
                return this.esSearch(query4);
            default:
                break;
        }
@@ -607,6 +636,12 @@
                    .in(Video::getId, chunk.stream().map(CollectTypeNumVO::getId).collect(Collectors.toList()))
                    .set(Video::getCollectNumJob, Boolean.FALSE)
                    .update();
            // 更新es的收藏数
            for (CollectTypeNumVO vo : chunk) {
                Map<String, Object> fields = new HashMap<>(1);
                fields.put("collectNum", vo.getCountNum());
                esService.updateSomeField(EsSuffix.VIDEO_INDEX_NAME, vo.getId(), fields);
            }
        }
    }

@@ -621,6 +656,12 @@
                    .in(Video::getId, chunk.stream().map(CollectTypeNumVO::getId).collect(Collectors.toList()))
                    .set(Video::getCommentNumJob, Boolean.FALSE)
                    .update();
            // 更新es的评论数
            for (CollectTypeNumVO vo : chunk) {
                Map<String, Object> fields = new HashMap<>(1);
                fields.put("commentNum", vo.getCountNum());
                esService.updateSomeField(EsSuffix.VIDEO_INDEX_NAME, vo.getId(), fields);
            }
        }
    }

@@ -1078,6 +1119,95 @@
                    .in(Video::getId, chunk.stream().map(CollectTypeNumVO::getId).collect(Collectors.toList()))
                    .set(Video::getThumbsUpNumJob, Boolean.FALSE)
                    .update();
            // 更新es的点赞数
            for (CollectTypeNumVO vo : chunk) {
                Map<String, Object> fields = new HashMap<>(1);
                fields.put("thumbsUpNum", vo.getCountNum());
                esService.updateSomeField(EsSuffix.VIDEO_INDEX_NAME, vo.getId(), fields);
            }
        }
    }

    @Override
    public Result esSearch(VideoEsQuery q) {
        // 判断商品索引是否存在
        if (!restTemplate.indexOps(VideoIndex.class).exists()) {
            return Result.ok();
        }
        q.setPageNumber(q.getPageNumber() - 1); // 前端保持统一从第一页开始，但是es从0页开始，所以减一
        // 根据点赞数排序
        Pageable pageable = PageRequest.of(q.getPageNumber(), q.getPageSize(), Sort.by(Sort.Direction.DESC, "thumbsUpNum"));

        NativeSearchQueryBuilder queryBuilder = new NativeSearchQueryBuilder();
        queryBuilder.withPageable(pageable);

        if (StringUtils.isNotBlank(q.getKeyword())) {
            // 1. 构建主布尔查询
            BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();

            // 2. 添加标题匹配（非嵌套字段）
            boolQuery.should(QueryBuilders.matchQuery("title", q.getKeyword()));

            // 3. 添加嵌套标签匹配
            NestedQueryBuilder tagQuery = QueryBuilders.nestedQuery(
                    "tagList",
                    QueryBuilders.matchQuery("tagList.tagName", q.getKeyword()),
                    ScoreMode.Total  // 使用总分模式
            );
            boolQuery.should(tagQuery);

            // 4. 添加嵌套商品匹配
            NestedQueryBuilder goodsQuery = QueryBuilders.nestedQuery(
                    "goodsList",
                    QueryBuilders.matchQuery("goodsList.goodsName", q.getKeyword()),
                    ScoreMode.Total
            );
            boolQuery.should(goodsQuery);

            // 5. 设置至少匹配一个条件（OR逻辑）
            boolQuery.minimumShouldMatch(1);

            // 6. 状态为已发布的
            boolQuery.must(QueryBuilders.termQuery("status", VideoStatusEnum.PUBLISHED.getValue()));
            queryBuilder.withQuery(boolQuery);
        } else {
            return Result.ok().data(new ArrayList<>()).total(0);
        }
        NativeSearchQuery query = queryBuilder.build();
        SearchHits<VideoIndex> searchHits = restTemplate.search(query, VideoIndex.class);
        if (CollectionUtils.isEmpty(searchHits.getSearchHits())) {
            return Result.ok().data(new ArrayList<>()).total(0);
        }
        List<VideoIndex> data = searchHits.stream().map(hit -> hit.getContent()).collect(Collectors.toList());
        List<String> videoIds = data.stream().map(VideoIndex::getId).collect(Collectors.toList());
        // 对象转换
        Map<String, List<SimpleMyCollectVO>> collectMap = myCollectService.getCollectsByVideoIds(videoIds)
                .stream()
                .collect(Collectors.groupingBy(SimpleMyCollectVO::getRefId));
        Map<String, List<SimpleMyThumbsUpVO>> thumbsUpMap = thumbsUpRecordService.getThumbssByVideoIds(videoIds)
                .stream()
                .collect(Collectors.groupingBy(SimpleMyThumbsUpVO::getRefId));
        List<String> subscribes = mySubscribeService.getSubscribesByUserId(UserContext.getCurrentUserId());
        List<WxVideoVO> vos = data.stream().map(videoIndex -> {
            WxVideoVO wxVideoVO = new WxVideoVO();
            BeanUtils.copyProperties(videoIndex, wxVideoVO);
            // 判断是否关注作者、是否点赞、是否收藏
            wxVideoVO.setCollected(CollectionUtils.isNotEmpty(collectMap.get(wxVideoVO.getId())));
            wxVideoVO.setThumbsUp(CollectionUtils.isNotEmpty(thumbsUpMap.get(wxVideoVO.getId())));
            if (UserContext.getCurrentUserId().equals(wxVideoVO.getAuthorId())) {
                wxVideoVO.setSubscribeThisAuthor(Boolean.TRUE);
            } else {
                wxVideoVO.setSubscribeThisAuthor(subscribes.contains(wxVideoVO.getAuthorId()));
            }
            if (VideoContentTypeEnum.VIDEO.getValue().equals(wxVideoVO.getVideoContentType())) {
                wxVideoVO.setCoverUrl(cosUtil.getPreviewUrl(wxVideoVO.getCoverFileKey()));
                wxVideoVO.setVideoUrl(cosUtil.getPreviewUrl(wxVideoVO.getVideoFileKey()));
            } else if (VideoContentTypeEnum.IMG.getValue().equals(wxVideoVO.getVideoContentType()) && StringUtils.isNotBlank(wxVideoVO.getVideoImgs())) {
                wxVideoVO.setImgs(JSON.parseArray(wxVideoVO.getVideoImgs(), String.class).stream().map(fileKey -> cosUtil.getPreviewUrl(fileKey)).collect(Collectors.toList()));
                wxVideoVO.setCoverUrl(wxVideoVO.getImgs().get(0));
            }
            return wxVideoVO;
        }).collect(Collectors.toList());
        return Result.ok().data(vos).total(searchHits.getTotalHits());
    }
}

 framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java

@@ -6,6 +6,8 @@
import cn.lili.modules.goods.entity.dos.GoodsSku;
import cn.lili.modules.goods.entity.dto.GoodsParamsDTO;
import cn.lili.modules.promotion.tools.PromotionTools;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -15,6 +17,7 @@
import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.ArrayList;
@@ -271,6 +274,18 @@
    @Field(type = FieldType.Nested)
    private List<EsGoodsAttribute> attrList;


    @ApiModelProperty(value = "预售结束时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @Field(type = FieldType.Date)
    private Date preSaleEndDate;

    @ApiModelProperty(value = "预售开始时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @Field(type = FieldType.Date)
    private Date preSaleBeginDate;
    /**
     * 商品促销活动集合
     * key 为 促销活动类型

 framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoodsSearchDTO.java

@@ -79,6 +79,9 @@
    @ApiModelProperty("是否开启商品过滤")
    private Boolean canFilter;

    @ApiModelProperty("是否需要开启过滤预售商品")
    private Boolean needFilterPre;



    //过滤搜索关键字

 framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java

@@ -48,6 +48,10 @@
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
import org.springframework.stereotype.Service;

import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;

@@ -93,7 +97,7 @@
            cache.incrementScore(CachePrefix.HOT_WORD.getPrefix(), searchDTO.getKeyword());
        }
        NativeSearchQueryBuilder searchQueryBuilder = createSearchQueryBuilder(searchDTO, pageVo);
        if (Objects.nonNull(searchDTO.getCanFilter())&&searchDTO.getCanFilter()){
        if (Objects.nonNull(searchDTO.getCanFilter()) && searchDTO.getCanFilter()) {
            searchQueryBuilder.withCollapseField("goodsId.keyword");
        }
        NativeSearchQuery searchQuery = searchQueryBuilder.build();
@@ -557,6 +561,23 @@
        if (CharSequenceUtil.isNotEmpty(searchDTO.getPromotionsId()) && CharSequenceUtil.isNotEmpty(searchDTO.getPromotionType())) {
            filterBuilder.must(QueryBuilders.wildcardQuery("promotionMapJson", "*" + searchDTO.getPromotionType() + "-" + searchDTO.getPromotionsId() + "*"));
        }

        if (Objects.nonNull(searchDTO.getNeedFilterPre()) && searchDTO.getNeedFilterPre()) {
            // 转换为当天 00:00:00 的时间戳（毫秒）
            long time = LocalDate.now().atStartOfDay(ZoneId.systemDefault())
                    .toInstant()
                    .toEpochMilli();
            // 条件2：预售结束时间 >= 当前时间 OR 结束时间为空
            filterBuilder.must(QueryBuilders.boolQuery()
                    .should(QueryBuilders.rangeQuery("preSaleEndDate").gte(time))
                    .should(QueryBuilders.boolQuery()
                            .mustNot(QueryBuilders.existsQuery("preSaleEndDate"))));
            // 条件1：预售开始时间 <= 当前时间 OR 开始时间为空
            filterBuilder.must(QueryBuilders.boolQuery()
                    .should(QueryBuilders.rangeQuery("preSaleBeginDate").lte(time))
                    .should(QueryBuilders.boolQuery()
                            .mustNot(QueryBuilders.existsQuery("preSaleBeginDate"))));
        }
        //价格区间判定
        if (CharSequenceUtil.isNotEmpty(searchDTO.getPrice())) {
            String[] prices = searchDTO.getPrice().split("_");

 framework/src/main/resources/es/video.json

@@ -11,7 +11,11 @@
      "analyzer": "ik_max_word"
    },
    "authorAvatar": {"type": "keyword"},
    "publishTime": {"type": "date"},
    "recommend": {"type": "boolean"},
    "collectNum": {"type": "integer"},
    "thumbsUpNum": {"type": "integer"},
    "commentNum": {"type": "integer"},
    "coverFileKey": {"type": "keyword"},
    "videoFileKey": {"type": "keyword"},
    "videoContentType": {"type": "keyword"},

 framework/src/main/resources/mapper/lmk/VideoMapper.xml

@@ -620,9 +620,13 @@
        <result column="title" property="title" />
        <result column="status" property="status" />
        <result column="recommend" property="recommend" />
        <result column="audit_pass_time" property="publishTime" />
        <result column="video_content_type" property="videoContentType" />
        <result column="video_type" property="videoType" />
        <result column="video_imgs" property="videoImgs" />
        <result column="collect_num" property="collectNum" />
        <result column="thumbs_up_num" property="thumbsUpNum" />
        <result column="comment_num" property="commentNum" />
        <collection property="goodsList" column="id" select="getVideoGoods" ofType="cn.lili.modules.lmk.domain.vo.VideoGoodsDetailVO"/>
        <collection property="tagList" column="id" select="getVideoTags" ofType="cn.lili.modules.lmk.domain.vo.SimpleVideoTagVO"/>
    </resultMap>
@@ -655,15 +659,26 @@
            LV.collect_num,
            LV.thumbs_up_num,
            LV.weight,
            LV.audit_pass_time,
            CASE
                WHEN LV.audit_pass_time IS NOT NULL THEN LV.audit_pass_time
                ELSE LV.create_time
            END as audit_pass_time,
            LV.update_time,
            LV.create_time,
            LV.video_content_type,
            LV.video_type,
            LV.video_imgs,
            LV.id,
            LM.nick_name as authorName,
            LM.face as authorAvatar
            CASE
                WHEN LM.nick_name IS NOT NULL THEN LM.nick_name
                WHEN LM.nick_name IS NULL THEN (SELECT nick_name FROM li_admin_user WHERE id = LV.author_id)
                ELSE ''
            END as authorName,
            CASE
                WHEN LM.face IS NOT NULL THEN LM.face
                WHEN LM.face IS NULL THEN (SELECT avatar FROM li_admin_user WHERE id = LV.author_id)
                ELSE ''
                END as authorAvatar
        FROM
            lmk_video LV
                LEFT JOIN li_member LM ON LV.author_id = LM.id

 seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java

@@ -27,6 +27,7 @@
import cn.lili.modules.store.entity.dos.StoreDetail;
import cn.lili.modules.store.service.StoreDetailService;
import cn.lili.utils.COSUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -148,6 +149,7 @@
    @ApiOperation(value = "新增商品")
    @PostMapping(value = "/create", consumes = "application/json", produces = "application/json")
    public ResultMessage<GoodsOperationDTO> save(@Valid @RequestBody GoodsOperationDTO goodsOperationDTO) {
        System.err.println(JSONObject.toJSONString(goodsOperationDTO));
        goodsService.addGoods(goodsOperationDTO);
        return ResultUtil.success();
    }
@@ -155,6 +157,7 @@
    @ApiOperation(value = "修改商品")
    @PutMapping(value = "/update/{goodsId}", consumes = "application/json", produces = "application/json")
    public ResultMessage<GoodsOperationDTO> update(@Valid @RequestBody GoodsOperationDTO goodsOperationDTO, @PathVariable String goodsId) {
        System.err.println(JSONObject.toJSONString(goodsOperationDTO));
        goodsService.editGoods(goodsOperationDTO, goodsId);
        return ResultUtil.success();
    }