|
@@ -2,6 +2,8 @@ package com.qs.mp.web.controller.api.user;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
+import com.github.xiaoymin.knife4j.annotations.DynamicParameter;
|
|
|
+import com.github.xiaoymin.knife4j.annotations.DynamicParameters;
|
|
|
import com.qs.mp.admin.domain.ExchangeBanner;
|
|
|
import com.qs.mp.admin.domain.Goods;
|
|
|
import com.qs.mp.admin.domain.GoodsCategory;
|
|
@@ -32,6 +34,9 @@ import java.util.Arrays;
|
|
|
import java.util.Iterator;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
+
|
|
|
+import io.swagger.annotations.ApiResponse;
|
|
|
+import io.swagger.annotations.ApiResponses;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import ma.glasnost.orika.MapperFacade;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
@@ -45,7 +50,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
@RestController
|
|
|
@RequestMapping("/api/v1/mp/user/exchange")
|
|
|
-@Api(tags = "盲票商城接口")
|
|
|
+@Api(tags = "盲票兑换大厅接口")
|
|
|
@AllArgsConstructor
|
|
|
public class UserExchangeController extends BaseApiController {
|
|
|
|
|
@@ -79,6 +84,15 @@ public class UserExchangeController extends BaseApiController {
|
|
|
*/
|
|
|
@PostMapping("/goods/list")
|
|
|
@ApiOperation(value = "商品列表", notes = "获取所有可兑换商品")
|
|
|
+ @DynamicParameters(properties = {
|
|
|
+ @DynamicParameter(name = "categoryId",value = "分类id",dataTypeClass = Long.class),
|
|
|
+ @DynamicParameter(name = "tagIds",value = "标签id",dataTypeClass = String.class),
|
|
|
+ @DynamicParameter(name = "startPrice",value = "开始价格",dataTypeClass = Integer.class),
|
|
|
+ @DynamicParameter(name = "endPrice",value = "结束价格",dataTypeClass = Integer.class)
|
|
|
+ })
|
|
|
+ @ApiResponses(
|
|
|
+ @ApiResponse(code = 200, message = "success" , response = GoodsListVO.class)
|
|
|
+ )
|
|
|
public TableDataInfo list(@RequestBody JSONObject param) {
|
|
|
Long categoryId = param.getLong("categoryId");
|
|
|
String tagIds = param.getString("tagIds");
|
|
@@ -99,7 +113,8 @@ public class UserExchangeController extends BaseApiController {
|
|
|
.le(null != endPrice && 0 != endPrice, Goods::getExchangePrice, endPrice)
|
|
|
.eq(Goods::getStatus, GoodsStatusEnum.PUT_ON)
|
|
|
.eq(Goods::getExchangeShow, 1)
|
|
|
- .in(!CollectionUtils.isEmpty(goodsIds), Goods::getGoodsId, goodsIds));
|
|
|
+ .in(!CollectionUtils.isEmpty(goodsIds), Goods::getGoodsId, goodsIds)
|
|
|
+ .orderByDesc(Goods::getSortWeight));
|
|
|
List<GoodsListVO> goodsListVOList = mapperFacade.mapAsList(goodsList, GoodsListVO.class);
|
|
|
TableDataInfo rspData = getDataTable(goodsList);
|
|
|
rspData.setRows(goodsListVOList);
|