BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 289f0409d0d23fe2997900b2e10c19cd9fa971de

Authored by puhui999
2 parents 3c74b229 e7186768

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

Inline Side-by-side
Showing 3 changed files with 7 additions and 4 deletions
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppCommentPageReqVO.java
  View file @289f040
@@ -27,12 +27,12 @@ public class AppCommentPageReqVO extends PageParam { @@ -27,12 +27,12 @@ public class AppCommentPageReqVO extends PageParam {
27 */ 27 */
28 public static final Integer NEGATIVE_COMMENT = 3; 28 public static final Integer NEGATIVE_COMMENT = 3;
29 29
30 - @Schema(description = "商品SPU编号", example = "29502")  
31 - @NotNull(message = "商品SPU编号不能为空") 30 + @Schema(description = "商品 SPU 编号", example = "29502")
  31 + @NotNull(message = "商品 SPU 编号不能为空")
32 private Long spuId; 32 private Long spuId;
33 33
34 @Schema(description = "app 评论页 tab 类型 (0 全部、1 好评、2 中评、3 差评)", example = "0") 34 @Schema(description = "app 评论页 tab 类型 (0 全部、1 好评、2 中评、3 差评)", example = "0")
35 - @NotNull(message = "商品SPU编号不能为空") 35 + @NotNull(message = "商品 SPU 编号不能为空")
36 private Integer type; 36 private Integer type;
37 37
38 } 38 }
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java
  View file @289f040
@@ -99,6 +99,9 @@ public class AppActivityController { @@ -99,6 +99,9 @@ public class AppActivityController {
99 .setSpuId(item.getSpuId()).setStartTime(item.getStartTime()).setEndTime(item.getEndTime())); 99 .setSpuId(item.getSpuId()).setStartTime(item.getStartTime()).setEndTime(item.getEndTime()));
100 }); 100 });
101 } 101 }
  102 +
  103 + // TODO 芋艿：满减送活动
  104 + // TODO 芋艿：限时折扣活动
102 return activityList; 105 return activityList;
103 } 106 }
104 107
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponTemplateController.java
  View file @289f040
@@ -47,7 +47,7 @@ public class AppCouponTemplateController { @@ -47,7 +47,7 @@ public class AppCouponTemplateController {
47 @Operation(summary = "获得优惠劵模版列表") 47 @Operation(summary = "获得优惠劵模版列表")
48 @Parameters({ 48 @Parameters({
49 @Parameter(name = "spuId", description = "商品 SPU 编号"), // 目前主要给商品详情使用 49 @Parameter(name = "spuId", description = "商品 SPU 编号"), // 目前主要给商品详情使用
50 - @Parameter(name = "useType", description = "使用类型"), 50 + @Parameter(name = "productScope", description = "使用类型"),
51 @Parameter(name = "count", description = "数量", required = true) 51 @Parameter(name = "count", description = "数量", required = true)
52 }) 52 })
53 public CommonResult<List<AppCouponTemplateRespVO>> getCouponTemplateList( 53 public CommonResult<List<AppCouponTemplateRespVO>> getCouponTemplateList(