lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
owen 2023-12-13 16:24:57 +08:00
commit 6de17c38fd
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java
View File

@ -99,6 +99,9 @@ public class AppActivityController {
.setSpuId(item.getSpuId()).setStartTime(item.getStartTime()).setEndTime(item.getEndTime())); .setSpuId(item.getSpuId()).setStartTime(item.getStartTime()).setEndTime(item.getEndTime()));
}); });
} }
// TODO 芋艿：满减送活动
// TODO 芋艿：限时折扣活动
return activityList; return activityList;
} }

2
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponTemplateController.java
View File

@ -47,7 +47,7 @@ public class AppCouponTemplateController {
@Operation(summary = "获得优惠劵模版列表") @Operation(summary = "获得优惠劵模版列表")
@Parameters({ @Parameters({
@Parameter(name = "spuId", description = "商品 SPU 编号"), // 目前主要给商品详情使用 @Parameter(name = "spuId", description = "商品 SPU 编号"), // 目前主要给商品详情使用
@Parameter(name = "useType", description = "使用类型"), @Parameter(name = "productScope", description = "使用类型"),
@Parameter(name = "count", description = "数量", required = true) @Parameter(name = "count", description = "数量", required = true)
}) })
public CommonResult<List<AppCouponTemplateRespVO>> getCouponTemplateList( public CommonResult<List<AppCouponTemplateRespVO>> getCouponTemplateList(