cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

完善收藏足迹

Browse Source
This commit is contained in:
xuwenbo
2020-09-03 16:15:59 +08:00
parent 877daeb6fd
commit 214d999353
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductRelationServiceImpl.java
View File

@ -68,7 +68,7 @@ public class YxStoreProductRelationServiceImpl extends BaseServiceImpl<YxStorePr
@Override
public List<YxStoreProductRelationQueryVo> userCollectProduct(int page, int limit, Long uid,String type) {
Page<YxStoreProductRelation> pageModel = new Page<>(page, limit);
List<YxStoreProductRelationQueryVo> list = yxStoreProductRelationMapper.selectList(pageModel,uid,type);
List<YxStoreProductRelationQueryVo> list = yxStoreProductRelationMapper.selectRelationList(pageModel,uid,type);
return list;
}
@ -139,7 +139,7 @@ public class YxStoreProductRelationServiceImpl extends BaseServiceImpl<YxStorePr
PageResult<YxStoreProductRelationDto> 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;
}

2
yshop-mall/src/main/java/co/yixiang/modules/product/service/mapper/YxStoreProductRelationMapper.java
View File

@ -34,7 +34,7 @@ public interface YxStoreProductRelationMapper extends CoreMapper<YxStoreProductR
"B.ot_price as otPrice,B.sales,B.image,B.is_show as isShow" +
" from yx_store_product_relation A left join yx_store_product B " +
"on A.product_id = B.id where A.type=#{type} and A.uid=#{uid} and A.is_del = 0 and B.is_del = 0 order by create_time desc")
List<YxStoreProductRelationQueryVo> selectList(Page page, @Param("uid") Long uid,@Param("type") String type);
List<YxStoreProductRelationQueryVo> selectRelationList(Page page, @Param("uid") Long uid, @Param("type") String type);
}

9
yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java
View File

@ -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 = "删除拼团")

8
yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java
View File

@ -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")