|
@@ -81,14 +81,13 @@ public class ChannelGoodsController extends BaseApiController {
|
|
|
@PostMapping("/goods/list/channel")
|
|
|
@ApiOperation("门店铺设商品列表")
|
|
|
@ApiResponses(
|
|
|
-
|
|
|
@ApiResponse(code = 200, message = "成功", response = ChannelGoodsVO.class)
|
|
|
)
|
|
|
public TableDataInfo goodsListChannel(@RequestBody SiteGoodsForChannelQueryParam param) {
|
|
|
Long channelId = SecurityUtils.getLoginUser().getChannelId();
|
|
|
|
|
|
QueryWrapper<ChannelGoods> wrapper = new QueryWrapper<ChannelGoods>().eq("t1.channel_id", channelId).eq("t1.status", param.getSettleStatus());
|
|
|
- if (ChannelGoodsSettleStatusTypeEnum.NO.getValue().equals(param.getSettleStatus())) {
|
|
|
+ if (ChannelGoodsSettleStatusTypeEnum.NO.equals(param.getSettleStatus())) {
|
|
|
wrapper.orderByAsc("t1.remain_qty");
|
|
|
wrapper.orderByDesc("t1.create_time");
|
|
|
} else {
|
|
@@ -99,6 +98,9 @@ public class ChannelGoodsController extends BaseApiController {
|
|
|
}
|
|
|
|
|
|
@PostMapping("goods/list/under/channel")
|
|
|
+ @ApiResponses(
|
|
|
+ @ApiResponse(code = 200, message = "成功", response = ChannelGoodsVO.class)
|
|
|
+ )
|
|
|
@ApiOperation("渠道下门店库存列表")
|
|
|
public TableDataInfo goodsListUnderChannel() {
|
|
|
startPage();
|