From add46ca247cb527b0e8fabd217ac73e84ac7e5cd Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 04 八月 2025 18:11:38 +0800
Subject: [PATCH] 主页视频，厨神，大健康，商品二维码优惠卷领取状态，优惠卷领取状态
---
buyer-api/src/main/java/cn/lili/controller/promotion/CouponBuyerController.java | 9 +++
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java | 37 ++++++++++++
framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponVO.java | 4 +
framework/src/main/java/cn/lili/modules/promotion/service/CouponService.java | 3 +
framework/src/main/java/cn/lili/modules/lmk/domain/query/WxKitchenVideoQuery.java | 2
framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java | 6 +-
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java | 5 +
framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java | 74 +++++++++++++++++++++---
framework/src/main/java/cn/lili/modules/lmk/domain/query/WxHealthVideoQuery.java | 3 +
9 files changed, 127 insertions(+), 16 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/CouponBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/CouponBuyerController.java
index 3fb6dae..a6d4674 100644
--- a/buyer-api/src/main/java/cn/lili/controller/promotion/CouponBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/promotion/CouponBuyerController.java
@@ -43,6 +43,7 @@
@RequestMapping("/buyer/promotion/coupon")
public class CouponBuyerController {
+
/**
* 浼樻儬鍒�
*/
@@ -85,15 +86,23 @@
@GetMapping
@ApiOperation(value = "鑾峰彇鍙鍙栦紭鎯犲埜鍒楄〃")
public ResultMessage<IPage<CouponVO>> getCouponList(CouponSearchParams queryParam, PageVO page) {
+ System.out.println("------------------------------------");
+ System.out.println(queryParam);
queryParam.setPromotionStatus(PromotionsStatusEnum.START.name());
queryParam.setGetType(CouponGetEnum.FREE.name());
IPage<CouponVO> canUseCoupons = couponService.pageVOFindAll(queryParam, page);
+
+ List<CouponVO> list = canUseCoupons.getRecords();
+ couponService.getUserCouponsStatus(list);
+ //鏇村叿鐢ㄦ埛id
return ResultUtil.data(canUseCoupons);
}
@ApiOperation(value = "鑾峰彇褰撳墠浼氬憳鐨勪紭鎯犲埜鍒楄〃")
@GetMapping("/getCoupons")
public ResultMessage<IPage<MemberCoupon>> getCoupons(MemberCouponSearchParams param, PageVO pageVo) {
+ System.out.println("------------------------------------");
+ System.out.println(param);
AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
param.setMemberId(currentUser.getId());
return ResultUtil.data(memberCouponService.getMemberCoupons(param, pageVo));
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/query/WxHealthVideoQuery.java b/framework/src/main/java/cn/lili/modules/lmk/domain/query/WxHealthVideoQuery.java
index a133a5f..7c8980a 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/query/WxHealthVideoQuery.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/query/WxHealthVideoQuery.java
@@ -18,6 +18,9 @@
@ApiModelProperty("鏉ユ簮榛樿system,system/user")
private String source;
+
+
+ private String videoId;
/**
* @see VideoTypeEnum
*/
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/query/WxKitchenVideoQuery.java b/framework/src/main/java/cn/lili/modules/lmk/domain/query/WxKitchenVideoQuery.java
index 4cf6e6f..1eab189 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/query/WxKitchenVideoQuery.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/query/WxKitchenVideoQuery.java
@@ -19,6 +19,8 @@
@ApiModelProperty("鏉ユ簮榛樿system,system/user")
private String source;
+ private String videoId;
+
/**
* @see VideoTypeEnum
*/
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
index 825ffd3..12715a1 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
@@ -146,9 +146,9 @@
//鍒犻櫎娲诲姩鍚屾椂鍒犻櫎娲诲姩鐨勭浉鍏充俊鎭�
public void delActivityAndInformation(Activity activity){
- if (StringUtils.isNotEmpty(activity.getCover())){
- lmkFileService.deleteObject(activity.getCover());
- }
+// if (StringUtils.isNotEmpty(activity.getCover())){
+// lmkFileService.deleteObject(activity.getCover());
+// }
baseMapper.deleteById(activity.getId());
//鍒犻櫎瀹℃牳璁板綍
activityAuditRecordService.delActivityAuditById(activity.getId());
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 9cc98f7..c2f1777 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
@@ -558,15 +558,16 @@
case "recommend":// 鍔犺浇鎺ㄨ崘瑙嗛
baseMapper.recommendVideo(page, query);
//鎺ㄨ崘瑙嗛閲嶆柊鎺掑簭
- WxVideoVO wxVideoVO = null;
- if (StringUtils.isNotBlank(query.getVideoId())) {
- wxVideoVO = baseMapper.recommendVideoByVideoId(query);
- }
- List<WxVideoVO> records = page.getRecords();
- Collections.shuffle(records);
- if (wxVideoVO!=null) {
- records.set(0, wxVideoVO);
- }
+ buildRecommendVideoList(page, query.getVideoId());
+// WxVideoVO wxVideoVO = null;
+// if (StringUtils.isNotBlank(query.getVideoId())) {
+// wxVideoVO = baseMapper.recommendVideoByVideoId(query);
+// }
+// List<WxVideoVO> records = page.getRecords();
+// Collections.shuffle(records);
+// if (wxVideoVO!=null) {
+// records.set(0, wxVideoVO);
+// }
break;
case "author": // 鍔犺浇瑙嗛涓婚〉鎴戝彂甯冪殑瑙嗛
AuthorVideoQuery query1 = new AuthorVideoQuery();
@@ -699,7 +700,10 @@
public Result healthRecommendVideo(WxHealthVideoQuery query) {
IPage<WxVideoVO> page = PageUtil.getPage(query, WxVideoVO.class);
//鑾峰彇澶у仴搴疯棰戝垪琛�
+
baseMapper.recommendHealthVideo(page,query);
+ buildRecommendVideoList(page, query.getVideoId());
+
if (page.getTotal() > 0) {
page.getRecords().forEach(v -> {
v.setAuthorAvatar(cosUtil.getPreviewUrl(v.getAuthorAvatar()));
@@ -723,8 +727,11 @@
@Override
public Result kitchenRecommendVideo(WxKitchenVideoQuery query) {
IPage<WxVideoVO> page = PageUtil.getPage(query, WxVideoVO.class);
- baseMapper.wxKitchenVideoQuery(page, query);
- page.getRecords().forEach(v -> {
+ baseMapper.wxKitchenVideoQuery(page, query);
+
+ buildRecommendVideoList(page, query.getVideoId());
+
+ page.getRecords().forEach(v -> {
v.setAuthorAvatar(cosUtil.getPreviewUrl(v.getAuthorAvatar()));
if (VideoContentTypeEnum.VIDEO.getValue().equals(v.getVideoContentType())) {
v.setVideoUrl(cosUtil.getPreviewUrl(v.getVideoFileKey()));
@@ -734,6 +741,51 @@
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
+ /**
+ *
+ * @param page
+ * @param videoId videoId鎺ㄨ崘鐨勮棰慽d
+ */
+ private void buildRecommendVideoList(IPage<WxVideoVO> page, String videoId) {
+ //鏌ヨ鍒版湁瑙嗛鍒楄〃
+
+ if(org.apache.commons.collections.CollectionUtils.isNotEmpty(page.getRecords())){
+ //鐜板皢瑙嗛椤哄簭鎵撲贡
+ Collections.shuffle(page.getRecords());
+
+ WxVideoVO wxVideoVO = null;
+ if (StringUtils.isNotBlank(videoId)){
+ VideoQuery videoQuery = new VideoQuery();
+ videoQuery.setVideoId(videoId);
+ wxVideoVO = baseMapper.recommendVideoByVideoId(videoQuery);
+
+ boolean found = false;
+ int foundIndex = -1;
+
+ List<WxVideoVO> records = page.getRecords();
+ //鍒ゆ柇浜岀淮鐮佽繃鏉ョ殑videoId鏄惁瀛樺湪涓巔age.getRecords閲嶅 璁板綍涓嬫爣
+ for (int i = 0; i < records.size(); i++) {
+ if (wxVideoVO.getId().equals(records.get(i).getId())) {
+ found = true;
+ foundIndex = i;
+ break;
+ }
+ }
+ if (found){
+ WxVideoVO matchedRecord = records.remove(foundIndex);
+ records.add(0, matchedRecord);
+ }else {
+ // 濡傛灉娌℃壘鍒帮紝鏇挎崲棣栦綅
+ records.set(0, wxVideoVO);
+
+ }
+
+
+ }
+ }
+
+ }
+
@Override
@Transactional(rollbackFor = Exception.class)
public void updateCollectNumBatch(List<CollectTypeNumVO> numList) {
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
index 765e16c..24799c6 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
@@ -534,11 +534,12 @@
@Override
public Result updateMemberNickName(MemberNickNameForm form) {
Member member = baseMapper.selectById(form.getMemberId());
- if ("寰俊鐢ㄦ埛".equals(member.getNickName()) || StringUtils.isEmpty(member.getNickName())) {
+ if ("寰俊鐢ㄦ埛".equals(member.getNickName()) || StringUtils.isBlank(member.getNickName())) {
member.setNickName(form.getNickName());
baseMapper.updateById(member);
+ return Result.ok().data(member.getNickName());
}
- return Result.ok("淇敼鎴愬姛");
+ return Result.ok().data(member.getNickName());
}
@Override
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponVO.java
index 0a33ba9..2ba32ed 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponVO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponVO.java
@@ -28,6 +28,10 @@
private static final long serialVersionUID = 8372420376262437018L;
/**
+ * 鏄惁鎷ユ湁浼樻儬鍗�
+ */
+ private Boolean owned;
+ /**
* 淇冮攢鍏宠仈鐨勫晢鍝�
*/
@ApiModelProperty(value = "浼樻儬鍒稿叧鑱斿晢鍝侀泦鍚�")
diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/CouponService.java b/framework/src/main/java/cn/lili/modules/promotion/service/CouponService.java
index 47b9533..f0324a0 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/service/CouponService.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/service/CouponService.java
@@ -6,6 +6,8 @@
import cn.lili.modules.promotion.entity.vos.CouponVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
/**
* 浼樻儬鍒镐笟鍔″眰
*
@@ -14,6 +16,7 @@
*/
public interface CouponService extends AbstractPromotionsService<Coupon> {
+ void getUserCouponsStatus(List<CouponVO> list);
/**
* 棰嗗彇浼樻儬鍒�
*
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java
index 7e24ed9..a94ecee 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java
@@ -8,12 +8,16 @@
import cn.lili.common.event.TransactionCommitSendMQEvent;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.properties.RocketmqCustomProperties;
+import cn.lili.common.security.AuthUser;
+import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.DateUtil;
+import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.PageVO;
import cn.lili.modules.goods.entity.dos.GoodsSku;
import cn.lili.modules.goods.service.GoodsSkuService;
import cn.lili.modules.promotion.entity.dos.Coupon;
import cn.lili.modules.promotion.entity.dos.FullDiscount;
+import cn.lili.modules.promotion.entity.dos.MemberCoupon;
import cn.lili.modules.promotion.entity.dos.PromotionGoods;
import cn.lili.modules.promotion.entity.dto.search.CouponSearchParams;
import cn.lili.modules.promotion.entity.dto.search.FullDiscountSearchParams;
@@ -24,6 +28,7 @@
import cn.lili.modules.promotion.entity.enums.PromotionsStatusEnum;
import cn.lili.modules.promotion.entity.vos.CouponVO;
import cn.lili.modules.promotion.mapper.CouponMapper;
+import cn.lili.modules.promotion.mapper.MemberCouponMapper;
import cn.lili.modules.promotion.service.*;
import cn.lili.modules.promotion.tools.PromotionTools;
import cn.lili.mybatis.util.PageUtil;
@@ -31,6 +36,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
@@ -39,6 +45,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -82,6 +89,36 @@
@Autowired
private ApplicationEventPublisher applicationEventPublisher;
+ @Autowired
+ private MemberCouponMapper memberCouponMapper;
+ @Override
+ public void getUserCouponsStatus(List<CouponVO> list) {
+ AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
+ if (StringUtils.isNotBlank(currentUser.getId())){
+ List<String> ids = list.stream().map(CouponVO::getId).collect(Collectors.toList());
+
+ //鑾峰緱鍒嗛〉浼樻儬鍔靛悗鐨勭粨鏋滃悗锛屽垽鏂璞℃槸鍚﹁鐢ㄦ埛鑾峰緱杩囥��
+ List<MemberCoupon> userCouponVOS = new LambdaQueryChainWrapper<>(memberCouponMapper)
+ .in(MemberCoupon::getCouponId,ids)
+ .eq(MemberCoupon::getMemberId,currentUser.getId())
+ .list();
+ //鐢ㄦ埛鑾峰緱杩囩殑浼樻儬鍗穒d闆嗗悎
+ List<String> userHaveCouponIds = userCouponVOS.stream().map(MemberCoupon::getCouponId).collect(Collectors.toList());
+ //淇敼鐘舵��
+ for(CouponVO couponVO : list){
+ boolean owned = false;
+ for (String id : userHaveCouponIds){
+ if(id.equals(couponVO.getId())){
+ owned = true;
+ break;
+ }
+ }
+ couponVO.setOwned(owned);
+ }
+ }
+
+ }
+
/**
* 棰嗗彇浼樻儬鍒�
*
--
Gitblit v1.8.0