From 214d9993531aa1317c5f9ade51226a401f01320c Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Thu, 3 Sep 2020 16:15:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=94=B6=E8=97=8F=E8=B6=B3?= =?UTF-8?q?=E8=BF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/YxStoreProductRelationServiceImpl.java | 4 ++-- .../service/mapper/YxStoreProductRelationMapper.java | 2 +- .../activity/rest/StoreCombinationController.java | 9 ++++++--- .../modules/activity/rest/StoreSeckillController.java | 8 +++++--- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductRelationServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductRelationServiceImpl.java index 40b5121e..50984aa4 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductRelationServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductRelationServiceImpl.java @@ -68,7 +68,7 @@ public class YxStoreProductRelationServiceImpl extends BaseServiceImpl userCollectProduct(int page, int limit, Long uid,String type) { Page pageModel = new Page<>(page, limit); - List list = yxStoreProductRelationMapper.selectList(pageModel,uid,type); + List list = yxStoreProductRelationMapper.selectRelationList(pageModel,uid,type); return list; } @@ -139,7 +139,7 @@ public class YxStoreProductRelationServiceImpl extends BaseServiceImpl relationDtoPageResult = generator.convertPageInfo(page, YxStoreProductRelationDto.class); relationDtoPageResult.getContent().forEach(i ->{ i.setProduct(storeProductService.getById(i.getProductId())); - i.setUserName(userService.getYxUserById(i.getUid()).getUsername()); + i.setUserName(userService.getYxUserById(i.getUid()).getNickname()); }); return relationDtoPageResult; } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/mapper/YxStoreProductRelationMapper.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/mapper/YxStoreProductRelationMapper.java index ebbfc034..ffc0b8bf 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/mapper/YxStoreProductRelationMapper.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/mapper/YxStoreProductRelationMapper.java @@ -34,7 +34,7 @@ public interface YxStoreProductRelationMapper extends CoreMapper selectList(Page page, @Param("uid") Long uid,@Param("type") String type); + List selectRelationList(Page page, @Param("uid") Long uid, @Param("type") String type); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java index e8b27174..f9e42bff 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java @@ -7,6 +7,7 @@ package co.yixiang.modules.activity.rest; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; +import co.yixiang.constant.ShopConstants; import co.yixiang.enums.SpecTypeEnum; import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.activity.domain.YxStoreCombination; @@ -25,6 +26,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -73,7 +75,7 @@ public class StoreCombinationController { return new ResponseEntity<>(yxStoreCombinationService.queryAll(criteria,pageable),HttpStatus.OK); } - + @CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY,allEntries = true) @Log("新增拼团") @ApiOperation(value = "新增拼团") @PostMapping(value = "/yxStoreCombination") @@ -147,6 +149,7 @@ public class StoreCombinationController { return new ResponseEntity<>(map,HttpStatus.OK); } + @CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY,allEntries = true) @Log("修改拼团") @ApiOperation(value = "新增/修改拼团") @PutMapping(value = "/yxStoreCombination") @@ -160,7 +163,7 @@ public class StoreCombinationController { } } - + @CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY,allEntries = true) @ForbidSubmit @ApiOperation(value = "开启关闭") @PostMapping(value = "/yxStoreCombination/onsale/{id}") @@ -170,7 +173,7 @@ public class StoreCombinationController { yxStoreCombinationService.onSale(id,status); return new ResponseEntity(HttpStatus.OK); } - + @CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY,allEntries = true) @ForbidSubmit @Log("删除拼团") @ApiOperation(value = "删除拼团") diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java index 79951bdd..f2cebbd0 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java @@ -7,6 +7,7 @@ package co.yixiang.modules.activity.rest; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; +import co.yixiang.constant.ShopConstants; import co.yixiang.enums.SpecTypeEnum; import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.activity.domain.YxStoreSeckill; @@ -27,6 +28,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -65,7 +67,7 @@ public class StoreSeckillController { } - + @CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY,allEntries = true) @Log("发布") @ApiOperation(value = "发布") @PutMapping(value = "/yxStoreSeckill") @@ -78,7 +80,7 @@ public class StoreSeckillController { return new ResponseEntity(HttpStatus.NO_CONTENT); } } - + @CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY,allEntries = true) @ForbidSubmit @Log("删除") @ApiOperation(value = "删除") @@ -88,7 +90,7 @@ public class StoreSeckillController { yxStoreSeckillService.removeById(id); return new ResponseEntity(HttpStatus.OK); } - + @CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY,allEntries = true) @Log("新增秒杀") @ApiOperation(value = "新增秒杀") @PostMapping(value = "/yxStoreSeckill")