From 3056a0aa7539710ba01916da9d6d5eda5a00320e Mon Sep 17 00:00:00 2001 From: macro Date: Sat, 27 Jun 2020 10:34:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=85=B3=E6=B3=A8=E3=80=81?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E6=8E=A5=E5=8F=A3=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MemberAttentionController.java | 17 +++++++++++++++++ .../MemberProductCollectionController.java | 18 +++++++++++++++++- .../MemberBrandAttentionRepository.java | 1 + .../MemberProductCollectionRepository.java | 1 + .../portal/service/MemberAttentionService.java | 12 +++++++++++- .../service/MemberCollectionService.java | 4 ++++ .../impl/MemberAttentionServiceImpl.java | 14 ++++++++++++++ .../impl/MemberCollectionServiceImpl.java | 16 ++++++++++++++-- 8 files changed, 79 insertions(+), 4 deletions(-) diff --git a/mall-portal/src/main/java/com/macro/mall/portal/controller/MemberAttentionController.java b/mall-portal/src/main/java/com/macro/mall/portal/controller/MemberAttentionController.java index dc03511..80ea510 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/controller/MemberAttentionController.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/controller/MemberAttentionController.java @@ -3,6 +3,7 @@ package com.macro.mall.portal.controller; import com.macro.mall.common.api.CommonPage; import com.macro.mall.common.api.CommonResult; import com.macro.mall.portal.domain.MemberBrandAttention; +import com.macro.mall.portal.domain.MemberProductCollection; import com.macro.mall.portal.service.MemberAttentionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -55,4 +56,20 @@ public class MemberAttentionController { Page page = memberAttentionService.list(pageNum,pageSize); return CommonResult.success(CommonPage.restPage(page)); } + + @ApiOperation("显示关注品牌详情") + @RequestMapping(value = "/detail", method = RequestMethod.GET) + @ResponseBody + public CommonResult detail(@RequestParam Long brandId) { + MemberBrandAttention memberBrandAttention = memberAttentionService.detail(brandId); + return CommonResult.success(memberBrandAttention); + } + + @ApiOperation("清空关注列表") + @RequestMapping(value = "/clear", method = RequestMethod.POST) + @ResponseBody + public CommonResult clear() { + memberAttentionService.clear(); + return CommonResult.success(null); + } } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/controller/MemberProductCollectionController.java b/mall-portal/src/main/java/com/macro/mall/portal/controller/MemberProductCollectionController.java index f56601a..1c78787 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/controller/MemberProductCollectionController.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/controller/MemberProductCollectionController.java @@ -48,7 +48,7 @@ public class MemberProductCollectionController { } } - @ApiOperation("显示关注列表") + @ApiOperation("显示收藏列表") @RequestMapping(value = "/list", method = RequestMethod.GET) @ResponseBody public CommonResult> list(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, @@ -56,4 +56,20 @@ public class MemberProductCollectionController { Page page = memberCollectionService.list(pageNum,pageSize); return CommonResult.success(CommonPage.restPage(page)); } + + @ApiOperation("显示收藏商品详情") + @RequestMapping(value = "/detail", method = RequestMethod.GET) + @ResponseBody + public CommonResult detail(@RequestParam Long productId) { + MemberProductCollection memberProductCollection = memberCollectionService.detail(productId); + return CommonResult.success(memberProductCollection); + } + + @ApiOperation("清空收藏列表") + @RequestMapping(value = "/clear", method = RequestMethod.POST) + @ResponseBody + public CommonResult clear() { + memberCollectionService.clear(); + return CommonResult.success(null); + } } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/repository/MemberBrandAttentionRepository.java b/mall-portal/src/main/java/com/macro/mall/portal/repository/MemberBrandAttentionRepository.java index 44890fd..afb92b4 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/repository/MemberBrandAttentionRepository.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/repository/MemberBrandAttentionRepository.java @@ -15,4 +15,5 @@ public interface MemberBrandAttentionRepository extends MongoRepository findByMemberId(Long memberId, Pageable pageable); + void deleteAllByMemberId(Long memberId); } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/repository/MemberProductCollectionRepository.java b/mall-portal/src/main/java/com/macro/mall/portal/repository/MemberProductCollectionRepository.java index 1936bb9..d4fe60e 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/repository/MemberProductCollectionRepository.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/repository/MemberProductCollectionRepository.java @@ -15,4 +15,5 @@ public interface MemberProductCollectionRepository extends MongoRepository findByMemberId(Long memberId, Pageable pageable); + void deleteAllByMemberId(Long memberId); } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/MemberAttentionService.java b/mall-portal/src/main/java/com/macro/mall/portal/service/MemberAttentionService.java index 8b47617..6a64917 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/service/MemberAttentionService.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/service/MemberAttentionService.java @@ -23,5 +23,15 @@ public interface MemberAttentionService { /** * 获取用户关注列表 */ - Page list(Integer pageNum,Integer pageSize); + Page list(Integer pageNum, Integer pageSize); + + /** + * 获取用户关注详情 + */ + MemberBrandAttention detail(Long brandId); + + /** + * 清空关注列表 + */ + void clear(); } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/MemberCollectionService.java b/mall-portal/src/main/java/com/macro/mall/portal/service/MemberCollectionService.java index f886379..6bb7812 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/service/MemberCollectionService.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/service/MemberCollectionService.java @@ -15,4 +15,8 @@ public interface MemberCollectionService { int delete(Long productId); Page list(Integer pageNum, Integer pageSize); + + MemberProductCollection detail(Long productId); + + void clear(); } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/MemberAttentionServiceImpl.java b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/MemberAttentionServiceImpl.java index ad411d0..1a05d18 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/MemberAttentionServiceImpl.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/MemberAttentionServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; /** @@ -31,6 +32,7 @@ public class MemberAttentionServiceImpl implements MemberAttentionService { memberBrandAttention.setMemberId(member.getId()); memberBrandAttention.setMemberNickname(member.getNickname()); memberBrandAttention.setMemberIcon(member.getIcon()); + memberBrandAttention.setCreateTime(new Date()); MemberBrandAttention findAttention = memberBrandAttentionRepository.findByMemberIdAndBrandId(memberBrandAttention.getMemberId(), memberBrandAttention.getBrandId()); if (findAttention == null) { memberBrandAttentionRepository.save(memberBrandAttention); @@ -51,4 +53,16 @@ public class MemberAttentionServiceImpl implements MemberAttentionService { Pageable pageable = PageRequest.of(pageNum-1,pageSize); return memberBrandAttentionRepository.findByMemberId(member.getId(),pageable); } + + @Override + public MemberBrandAttention detail(Long brandId) { + UmsMember member = memberService.getCurrentMember(); + return memberBrandAttentionRepository.findByMemberIdAndBrandId(member.getId(), brandId); + } + + @Override + public void clear() { + UmsMember member = memberService.getCurrentMember(); + memberBrandAttentionRepository.deleteAllByMemberId(member.getId()); + } } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/MemberCollectionServiceImpl.java b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/MemberCollectionServiceImpl.java index 5ca5bca..e79b3fd 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/MemberCollectionServiceImpl.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/MemberCollectionServiceImpl.java @@ -48,7 +48,19 @@ public class MemberCollectionServiceImpl implements MemberCollectionService { @Override public Page list(Integer pageNum, Integer pageSize) { UmsMember member = memberService.getCurrentMember(); - Pageable pageable = PageRequest.of(pageNum-1,pageSize); - return productCollectionRepository.findByMemberId(member.getId(),pageable); + Pageable pageable = PageRequest.of(pageNum - 1, pageSize); + return productCollectionRepository.findByMemberId(member.getId(), pageable); + } + + @Override + public MemberProductCollection detail(Long productId) { + UmsMember member = memberService.getCurrentMember(); + return productCollectionRepository.findByMemberIdAndProductId(member.getId(), productId); + } + + @Override + public void clear() { + UmsMember member = memberService.getCurrentMember(); + productCollectionRepository.deleteAllByMemberId(member.getId()); } }