coupon(update)

src/main/java/com/mmc/oms/controller/CouponBackController.java

@@ -160,14 +160,14 @@ public class CouponBackController {
         return couponBackService.feignGetCouponType(type);
     }
 
-    @ApiOperation(value = "V2.3.2——商品优惠券普通活动列表")
+    @ApiOperation(value = "商品优惠券普通活动列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponDTO.class)})
     @PostMapping("/ordinaryActivities")
     public ResultBody<PageResult<CouponDTO>> ordinaryActivities(@Validated(Page.class) @RequestBody ProductCouponQO productCouponQO) {
         return couponBackService.ordinaryActivities(productCouponQO);
     }
 
-    @ApiOperation(value = "V2.3.2——商品优惠券裂变活动列表")
+    @ApiOperation(value = "商品优惠券裂变活动列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponDTO.class)})
     @PostMapping("/fissionActivity")
     public ResultBody<PageResult<PageResult>> fissionActivity(@Validated(Page.class) @RequestBody ProductCouponQO productCouponQO) {

src/main/java/com/mmc/oms/controller/CouponUserController.java

@@ -38,13 +38,13 @@ public class CouponUserController extends BaseController {
     @ApiOperation(value = "查看我的优惠卷")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponUserDTO.class)})
     @GetMapping("/checkMyCoupon")
-    public ResultBody getMyCoupon(@ApiParam(value = "状态 1：已使用, 2:已失效，3:已转赠")
-                                  @RequestParam(value = "status", required = false) Integer status,
-                                  @ApiParam(value = "页码", required = true)
-                                  @RequestParam(value = "pageNo") Integer pageNo,
-                                  @ApiParam(value = "每页显示数", required = true)
-                                  @RequestParam(value = "pageSize") Integer pageSize,
-                                  HttpServletRequest request) {
+    public ResultBody<CouponUserDTO> getMyCoupon(@ApiParam(value = "状态 1：已使用, 2:已失效，3:已转赠")
+                                                 @RequestParam(value = "status", required = false) Integer status,
+                                                 @ApiParam(value = "页码", required = true)
+                                                 @RequestParam(value = "pageNo") Integer pageNo,
+                                                 @ApiParam(value = "每页显示数", required = true)
+                                                 @RequestParam(value = "pageSize") Integer pageSize,
+                                                 HttpServletRequest request) {
         return couponUserService.getMyList(status, pageNo, pageSize, this.getCurrentAccount(request));
     }
 
@@ -75,13 +75,13 @@ public class CouponUserController extends BaseController {
     @ApiOperation(value = "获取可领取优惠券列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponListDTO.class)})
     @GetMapping("/webPageList")
-    public ResultBody getList(@ApiParam(value = "品牌id 搜索品牌指定优惠卷", required = false)
-                              @RequestParam(value = "productId", defaultValue = "0") List<Integer> productId,
-                              @ApiParam(value = "页码", required = true)
-                              @RequestParam(value = "pageNo") Integer pageNo,
-                              @ApiParam(value = "每页显示数", required = true)
-                              @RequestParam(value = "pageSize") Integer pageSize,
-                              HttpServletRequest request) {
+    public ResultBody<CouponListDTO> getList(@ApiParam(value = "品牌id 搜索品牌指定优惠卷", required = false)
+                                             @RequestParam(value = "productId", defaultValue = "0") List<Integer> productId,
+                                             @ApiParam(value = "页码", required = true)
+                                             @RequestParam(value = "pageNo") Integer pageNo,
+                                             @ApiParam(value = "每页显示数", required = true)
+                                             @RequestParam(value = "pageSize") Integer pageSize,
+                                             HttpServletRequest request) {
         return couponUserService.getList(productId, pageNo, pageSize, this.getCurrentAccount(request));
     }
 
@@ -187,9 +187,9 @@ public class CouponUserController extends BaseController {
             @ApiImplicitParam(name = "useType", required = false, value = "1vip券, 2品牌券"),
     })
     @GetMapping("/couponMerchandise")
-    public ResultBody couponMerchandise(@RequestParam(value = "couponId", required = false) Integer couponId,
-                                        @RequestParam(value = "productName", required = false) String productName,
-                                        @RequestParam(value = "useType", required = false) Integer useType) {
+    public ResultBody<AppGoodsInfoDTO> couponMerchandise(@RequestParam(value = "couponId", required = false) Integer couponId,
+                                                         @RequestParam(value = "productName", required = false) String productName,
+                                                         @RequestParam(value = "useType", required = false) Integer useType) {
         return couponUserService.couponMerchandise(couponId, productName, useType);
     }
 
@@ -199,7 +199,7 @@ public class CouponUserController extends BaseController {
     })
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponUsageDetailsDTO.class)})
     @GetMapping("/couponUsageDetails")
-    public ResultBody couponUsageDetails(@RequestParam(value = "uid", required = true) Integer uid) {
+    public ResultBody<CouponUsageDetailsDTO> couponUsageDetails(@RequestParam(value = "uid", required = true) Integer uid) {
         return couponUserService.couponUsageDetails(uid);
     }
 

src/main/java/com/mmc/oms/model/qo/BaseInfoQO.java

@@ -26,12 +26,12 @@ public class BaseInfoQO {
     @ApiModelProperty(value = "结束时间")
     private String endTime;
 
-    @ApiModelProperty(value = "页码")
+    @ApiModelProperty(value = "页码", example = "1")
     @NotNull(message = "页码不能为空", groups = {Page.class, Freeze.class})
     @Min(value = 1, groups = Page.class, message = "pageNo不能少于1")
     private Integer pageNo;
 
-    @ApiModelProperty(value = "每页显示数")
+    @ApiModelProperty(value = "每页显示数", example = "10")
     @NotNull(message = "每页显示数不能为空", groups = {Page.class, Freeze.class})
     @Min(value = 1, groups = Page.class, message = "pageSize不能少于1")
     private Integer pageSize;

src/main/java/com/mmc/oms/model/qo/ProductCouponQO.java

 package com.mmc.oms.model.qo;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -20,7 +19,7 @@ import java.io.Serializable;
 //@ApiModel(value = "ProductCouponQO对象",description = "ProductCouponQO查询Qo")
 public class ProductCouponQO extends BaseInfoQO implements Serializable {
 
-    @ApiModelProperty(value = "商品id")
+    @ApiModelProperty(value = "商品id", required = true)
     @NotNull(message = "参数[goodsInfoId]不能为空")
     private Integer goodsInfoId;