完善收藏足迹
This commit is contained in:
@ -68,7 +68,7 @@ public class YxStoreProductRelationServiceImpl extends BaseServiceImpl<YxStorePr
|
|||||||
@Override
|
@Override
|
||||||
public List<YxStoreProductRelationQueryVo> userCollectProduct(int page, int limit, Long uid,String type) {
|
public List<YxStoreProductRelationQueryVo> userCollectProduct(int page, int limit, Long uid,String type) {
|
||||||
Page<YxStoreProductRelation> pageModel = new Page<>(page, limit);
|
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;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -139,7 +139,7 @@ public class YxStoreProductRelationServiceImpl extends BaseServiceImpl<YxStorePr
|
|||||||
PageResult<YxStoreProductRelationDto> relationDtoPageResult = generator.convertPageInfo(page, YxStoreProductRelationDto.class);
|
PageResult<YxStoreProductRelationDto> relationDtoPageResult = generator.convertPageInfo(page, YxStoreProductRelationDto.class);
|
||||||
relationDtoPageResult.getContent().forEach(i ->{
|
relationDtoPageResult.getContent().forEach(i ->{
|
||||||
i.setProduct(storeProductService.getById(i.getProductId()));
|
i.setProduct(storeProductService.getById(i.getProductId()));
|
||||||
i.setUserName(userService.getYxUserById(i.getUid()).getUsername());
|
i.setUserName(userService.getYxUserById(i.getUid()).getNickname());
|
||||||
});
|
});
|
||||||
return relationDtoPageResult;
|
return relationDtoPageResult;
|
||||||
}
|
}
|
||||||
|
@ -34,7 +34,7 @@ public interface YxStoreProductRelationMapper extends CoreMapper<YxStoreProductR
|
|||||||
"B.ot_price as otPrice,B.sales,B.image,B.is_show as isShow" +
|
"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 " +
|
" 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")
|
"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);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -7,6 +7,7 @@ package co.yixiang.modules.activity.rest;
|
|||||||
|
|
||||||
import cn.hutool.core.bean.BeanUtil;
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
|
import co.yixiang.constant.ShopConstants;
|
||||||
import co.yixiang.enums.SpecTypeEnum;
|
import co.yixiang.enums.SpecTypeEnum;
|
||||||
import co.yixiang.logging.aop.log.Log;
|
import co.yixiang.logging.aop.log.Log;
|
||||||
import co.yixiang.modules.activity.domain.YxStoreCombination;
|
import co.yixiang.modules.activity.domain.YxStoreCombination;
|
||||||
@ -25,6 +26,7 @@ import com.alibaba.fastjson.JSONObject;
|
|||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
import org.springframework.cache.annotation.CacheEvict;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
@ -73,7 +75,7 @@ public class StoreCombinationController {
|
|||||||
return new ResponseEntity<>(yxStoreCombinationService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(yxStoreCombinationService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY,allEntries = true)
|
||||||
@Log("新增拼团")
|
@Log("新增拼团")
|
||||||
@ApiOperation(value = "新增拼团")
|
@ApiOperation(value = "新增拼团")
|
||||||
@PostMapping(value = "/yxStoreCombination")
|
@PostMapping(value = "/yxStoreCombination")
|
||||||
@ -147,6 +149,7 @@ public class StoreCombinationController {
|
|||||||
|
|
||||||
return new ResponseEntity<>(map,HttpStatus.OK);
|
return new ResponseEntity<>(map,HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
@CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY,allEntries = true)
|
||||||
@Log("修改拼团")
|
@Log("修改拼团")
|
||||||
@ApiOperation(value = "新增/修改拼团")
|
@ApiOperation(value = "新增/修改拼团")
|
||||||
@PutMapping(value = "/yxStoreCombination")
|
@PutMapping(value = "/yxStoreCombination")
|
||||||
@ -160,7 +163,7 @@ public class StoreCombinationController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY,allEntries = true)
|
||||||
@ForbidSubmit
|
@ForbidSubmit
|
||||||
@ApiOperation(value = "开启关闭")
|
@ApiOperation(value = "开启关闭")
|
||||||
@PostMapping(value = "/yxStoreCombination/onsale/{id}")
|
@PostMapping(value = "/yxStoreCombination/onsale/{id}")
|
||||||
@ -170,7 +173,7 @@ public class StoreCombinationController {
|
|||||||
yxStoreCombinationService.onSale(id,status);
|
yxStoreCombinationService.onSale(id,status);
|
||||||
return new ResponseEntity(HttpStatus.OK);
|
return new ResponseEntity(HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
@CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY,allEntries = true)
|
||||||
@ForbidSubmit
|
@ForbidSubmit
|
||||||
@Log("删除拼团")
|
@Log("删除拼团")
|
||||||
@ApiOperation(value = "删除拼团")
|
@ApiOperation(value = "删除拼团")
|
||||||
|
@ -7,6 +7,7 @@ package co.yixiang.modules.activity.rest;
|
|||||||
|
|
||||||
import cn.hutool.core.bean.BeanUtil;
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
|
import co.yixiang.constant.ShopConstants;
|
||||||
import co.yixiang.enums.SpecTypeEnum;
|
import co.yixiang.enums.SpecTypeEnum;
|
||||||
import co.yixiang.logging.aop.log.Log;
|
import co.yixiang.logging.aop.log.Log;
|
||||||
import co.yixiang.modules.activity.domain.YxStoreSeckill;
|
import co.yixiang.modules.activity.domain.YxStoreSeckill;
|
||||||
@ -27,6 +28,7 @@ import com.alibaba.fastjson.JSONObject;
|
|||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
import org.springframework.cache.annotation.CacheEvict;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
@ -65,7 +67,7 @@ public class StoreSeckillController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY,allEntries = true)
|
||||||
@Log("发布")
|
@Log("发布")
|
||||||
@ApiOperation(value = "发布")
|
@ApiOperation(value = "发布")
|
||||||
@PutMapping(value = "/yxStoreSeckill")
|
@PutMapping(value = "/yxStoreSeckill")
|
||||||
@ -78,7 +80,7 @@ public class StoreSeckillController {
|
|||||||
return new ResponseEntity(HttpStatus.NO_CONTENT);
|
return new ResponseEntity(HttpStatus.NO_CONTENT);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY,allEntries = true)
|
||||||
@ForbidSubmit
|
@ForbidSubmit
|
||||||
@Log("删除")
|
@Log("删除")
|
||||||
@ApiOperation(value = "删除")
|
@ApiOperation(value = "删除")
|
||||||
@ -88,7 +90,7 @@ public class StoreSeckillController {
|
|||||||
yxStoreSeckillService.removeById(id);
|
yxStoreSeckillService.removeById(id);
|
||||||
return new ResponseEntity(HttpStatus.OK);
|
return new ResponseEntity(HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
@CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY,allEntries = true)
|
||||||
@Log("新增秒杀")
|
@Log("新增秒杀")
|
||||||
@ApiOperation(value = "新增秒杀")
|
@ApiOperation(value = "新增秒杀")
|
||||||
@PostMapping(value = "/yxStoreSeckill")
|
@PostMapping(value = "/yxStoreSeckill")
|
||||||
|
Reference in New Issue
Block a user