p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
puhui999 2023-12-13 17:52:32 +08:00
parent 3c74b22933 e71867683e
commit 289f0409d0
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppCommentPageReqVO.java
View File

@ -27,12 +27,12 @@ public class AppCommentPageReqVO extends PageParam {
*/ */
public static final Integer NEGATIVE_COMMENT = 3; public static final Integer NEGATIVE_COMMENT = 3;
@Schema(description = "商品SPU编号", example = "29502") @Schema(description = "商品 SPU 编号", example = "29502")
@NotNull(message = "商品SPU编号不能为空") @NotNull(message = "商品 SPU 编号不能为空")
private Long spuId; private Long spuId;
@Schema(description = "app 评论页 tab 类型 (0 全部、1 好评、2 中评、3 差评)", example = "0") @Schema(description = "app 评论页 tab 类型 (0 全部、1 好评、2 中评、3 差评)", example = "0")
@NotNull(message = "商品SPU编号不能为空") @NotNull(message = "商品 SPU 编号不能为空")
private Integer type; private Integer type;
} }

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(