code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化楼层装修

Browse Source
This commit is contained in:
paulGao
2022-04-17 21:46:34 +08:00
parent 726eb06714
commit 37c5ce541b
8 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java
View File

@@ -36,7 +36,7 @@ public class StudioManagerController {
@ApiOperation(value = "获取店铺直播间列表")
@ApiImplicitParam(name = "status", value = "直播间状态", paramType = "query")
@GetMapping
public ResultMessage<IPage<Studio>> page(PageVO pageVO, String status) {
public ResultMessage<IPage<StudioVO>> page(PageVO pageVO, String status) {
return ResultUtil.data(studioService.studioList(pageVO, null, status));
}

5
manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java
View File

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
/**
@@ -37,8 +38,8 @@ public class PromotionManagerController {
@GetMapping("/current")
@ApiOperation(value = "获取当前进行中的促销活动")
public ResultMessage<Map<String, Object>> getCurrentPromotion() {
Map<String, Object> currentPromotion = promotionService.getCurrentPromotion();
public ResultMessage<Map<String, List<PromotionGoods>>> getCurrentPromotion() {
Map<String, List<PromotionGoods>> currentPromotion = promotionService.getCurrentPromotion();
return ResultUtil.data(currentPromotion);
}