From dc249113553d081aaa26d4d1f3718b5514363131 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 02 七月 2025 23:23:09 +0800
Subject: [PATCH] Merge branch 'dev' of http://42.193.1.25:9521/r/lmk-shop-java into dev
---
framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoodsSearchDTO.java | 3
framework/src/main/java/cn/lili/modules/lmk/domain/query/VideoEsQuery.java | 24 ++++
framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java | 23 +++
framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsSalesModeEnum.java | 1
framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java | 15 ++
buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java | 6 +
framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java | 8 +
framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java | 24 +++
framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java | 138 ++++++++++++++++++++++
framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuDTO.java | 16 ++
framework/src/main/java/cn/lili/modules/lmk/domain/query/VideoQuery.java | 3
seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java | 3
framework/src/main/resources/mapper/lmk/VideoMapper.xml | 21 +++
framework/src/main/java/cn/lili/modules/goods/mapper/GoodsSkuMapper.java | 2
framework/src/main/resources/es/video.json | 4
framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java | 17 ++
framework/src/main/java/cn/lili/modules/lmk/domain/es/VideoIndex.java | 16 ++
framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java | 7 +
consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java | 2
19 files changed, 320 insertions(+), 13 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java
index a8f665f..8078d3f 100644
--- a/buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java
+++ b/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);
+ }
}
diff --git a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java b/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java
index 555d3d4..78a065f 100644
--- a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java
+++ b/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;
}
diff --git a/framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java b/framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java
index e597687..0b2d077 100644
--- a/framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java
+++ b/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" +
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
index d8b663a..f233523 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
+++ b/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());
}
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java
index b795f16..d96d861 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java
+++ b/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杩囨护鏄洜涓簒ss杩囨护涓哄叏灞�杩囨护锛屽奖鍝嶅緢澶с��
// 涓氬姟涓紝鍏ㄥ眬浠ｇ爜涓彧鏈夊晢鍝佸悕绉颁笉鑳芥嫢鏈夎嫳鏂囬�楀彿锛屾槸鐢变簬鍟嗗搧鍚嶇О瀛樺湪涓�涓暟鎹簱鑱斿悎鏌ヨ锛岀粨鏋滆鏍规嵁閫楀彿鍒嗙粍
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuDTO.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuDTO.java
index a93db09..2d105d4 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuDTO.java
+++ b/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;
+
+
}
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsSalesModeEnum.java b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsSalesModeEnum.java
index b6d03aa..21e7a3f 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsSalesModeEnum.java
+++ b/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;
diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsSkuMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsSkuMapper.java
index 6b65a74..189fa33 100644
--- a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsSkuMapper.java
+++ b/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}")
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/es/VideoIndex.java b/framework/src/main/java/cn/lili/modules/lmk/domain/es/VideoIndex.java
index b38db0a..09f10d3 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/es/VideoIndex.java
+++ b/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;
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/query/VideoEsQuery.java b/framework/src/main/java/cn/lili/modules/lmk/domain/query/VideoEsQuery.java
new file mode 100644
index 0000000..1cdda02
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/query/VideoEsQuery.java
@@ -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锛歺p
+ * @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;
+}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/query/VideoQuery.java b/framework/src/main/java/cn/lili/modules/lmk/domain/query/VideoQuery.java
index 832bf33..3aa3b2a 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/query/VideoQuery.java
+++ b/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;
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java b/framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java
index 96614ec..2592ed4 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java
+++ b/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);
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java
index cdfff28..ad439e9 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java
+++ b/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涓殑鏁版嵁锛宮q寮傛澶勭悊
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());
+ }
}
diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java
index 493f594..acb53be 100644
--- a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java
+++ b/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 涓� 淇冮攢娲诲姩绫诲瀷
diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoodsSearchDTO.java b/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoodsSearchDTO.java
index ba73b62..0563531 100644
--- a/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoodsSearchDTO.java
+++ b/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoodsSearchDTO.java
@@ -79,6 +79,9 @@
@ApiModelProperty("鏄惁寮�鍚晢鍝佽繃婊�")
private Boolean canFilter;
+ @ApiModelProperty("鏄惁闇�瑕佸紑鍚繃婊ら鍞晢鍝�")
+ private Boolean needFilterPre;
+
//杩囨护鎼滅储鍏抽敭瀛�
diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java
index 0cadc1c..79d904b 100644
--- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java
+++ b/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("_");
diff --git a/framework/src/main/resources/es/video.json b/framework/src/main/resources/es/video.json
index bda78cd..ca5a219 100644
--- a/framework/src/main/resources/es/video.json
+++ b/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"},
diff --git a/framework/src/main/resources/mapper/lmk/VideoMapper.xml b/framework/src/main/resources/mapper/lmk/VideoMapper.xml
index 230ad1a..e9b22bf 100644
--- a/framework/src/main/resources/mapper/lmk/VideoMapper.xml
+++ b/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
diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java
index 8142cdf..ef7bfb9 100644
--- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java
+++ b/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();
}
--
Gitblit v1.8.0