mirror of
https://gitee.com/huangge1199_admin/vue-pro.git
synced 2024-11-22 23:31:52 +08:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
6de17c38fd
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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(
|
||||||
|
Loading…
Reference in New Issue
Block a user