Coupon(add)

src/main/java/com/mmc/oms/common/PageResult.java

 package com.mmc.oms.common;
 
 import com.mmc.oms.model.qo.BaseInfoQO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -17,10 +18,15 @@ import java.io.Serializable;
 @NoArgsConstructor
 public class PageResult<T> implements Serializable {
     private static final long serialVersionUID = -2848996493573325801L;
+    @ApiModelProperty(value = "分页起始页")
     private int pageNo;// 分页起始页
+    @ApiModelProperty(value = "每页记录数")
     private int pageSize;// 每页记录数
+    @ApiModelProperty(value = "返回的记录集合")
     private T list;// 返回的记录集合
+    @ApiModelProperty(value = "总记录条数")
     private long totalCount;// 总记录条数
+    @ApiModelProperty(value = "总页数")
     private long totalPage;// 总页数
 
     public static PageResult buildPage(int pageNo, int pageSize, int totalCount) {

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

@@ -54,7 +54,7 @@ public class CouponBackController {
     @ApiOperation(value = "V1.0.1--优惠券列表-分页")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponDTO.class)})
     @PostMapping("/pageList")
-    public ResultBody pageCouponList(@Validated(Page.class) @RequestBody CouponInfoQO couponInfoQO) {
+    public ResultBody<PageResult<CouponDTO>> pageCouponList(@Validated(Page.class) @RequestBody CouponInfoQO couponInfoQO) {
         return couponBackService.pageCouponList(couponInfoQO);
     }
 
@@ -62,14 +62,14 @@ public class CouponBackController {
     @ApiOperation(value = "V1.0.1--裂变优惠券列表-分页")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponActivityDTO.class)})
     @PostMapping("/pageActivityList")
-    public ResultBody pageActivityCouponList(@Validated(Page.class) @RequestBody CouponInfoQO couponInfoQO) {
+    public ResultBody<PageResult<CouponActivityDTO>> pageActivityCouponList(@Validated(Page.class) @RequestBody CouponInfoQO couponInfoQO) {
         return couponBackService.pageActivityCouponList(couponInfoQO);
     }
 
     @ApiOperation(value = "优惠券-下拉")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponActivityDTO.class)})
     @GetMapping("/getActivityCouponPullDown")
-    public ResultBody getActivityCouponPullDown(@ApiParam(value = "活动类型: 1裂变活动 2普通活动", required = true)
+    public ResultBody<CouponActivityDTO> getActivityCouponPullDown(@ApiParam(value = "活动类型: 1裂变活动 2普通活动", required = true)
                                                 @RequestParam(required = true, value = "type") Integer type) {
         return couponBackService.getActivityCouponPullDown(type);
     }
@@ -98,7 +98,7 @@ public class CouponBackController {
     @ApiOperation(value = "V1.0.1--获取优惠券使用数据")
     @ApiResponses({@ApiResponse(code = 200, message = "OK",response = CouponViewDTO.class)})
     @GetMapping("/getData")
-    public ResultBody getViewData(@Validated(Query.class)
+    public ResultBody<CouponViewDTO> getViewData(@Validated(Query.class)
                                   @ApiParam(value = "id", required = true)
                                   @RequestParam(required = true, value = "id") Integer id){
         return couponBackService.couponViewData(id);
@@ -107,7 +107,7 @@ public class CouponBackController {
     @ApiOperation(value = "V1.0.1--获取优惠券明细列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponUserDTO.class)})
     @PostMapping("/getUserCouponList")
-    public ResultBody getCouponUserList(@Validated(Page.class) @RequestBody CouponUserInfoQO couponUserInfoQO){
+    public ResultBody<CouponUserDTO> getCouponUserList(@Validated(Page.class) @RequestBody CouponUserInfoQO couponUserInfoQO){
         return couponBackService.getCouponUserList(couponUserInfoQO);
     }
 
@@ -161,13 +161,13 @@ public class CouponBackController {
     @ApiOperation(value = "V2.3.2——商品优惠券普通活动列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponDTO.class)})
     @PostMapping("/ordinaryActivities")
-    public ResultBody  ordinaryActivities(@Validated(Page.class) @RequestBody ProductCouponQO productCouponQO) {
+    public ResultBody<PageResult<CouponDTO>>  ordinaryActivities(@Validated(Page.class) @RequestBody ProductCouponQO productCouponQO) {
         return couponBackService.ordinaryActivities(productCouponQO);
     }
     @ApiOperation(value = "V2.3.2——商品优惠券裂变活动列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponDTO.class)})
     @PostMapping("/fissionActivity")
-    public ResultBody  fissionActivity(@Validated(Page.class) @RequestBody ProductCouponQO productCouponQO) {
+    public ResultBody<PageResult<PageResult>>  fissionActivity(@Validated(Page.class) @RequestBody ProductCouponQO productCouponQO) {
         return couponBackService.fissionActivity(productCouponQO);
     }
 }

src/main/java/com/mmc/oms/entity/CouponUserDO.java

@@ -28,7 +28,7 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("coupon_user")
-@ApiModel(value = "CouponUser对象", description = "用户优惠券记录表")
+//@ApiModel(value = "CouponUser对象", description = "用户优惠券记录表")
 public class CouponUserDO implements Serializable {
 
     private static final long serialVersionUID = 1L;

src/main/java/com/mmc/oms/model/dto/CouponActivityDTO.java

@@ -16,9 +16,9 @@ import java.util.Date;
  */
 @Builder
 @Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="CouponActivity对象", description="裂变优惠券")
+//@EqualsAndHashCode(callSuper = false)
+//@Accessors(chain = true)
+//@ApiModel(value="CouponActivity对象", description="裂变优惠券")
 @AllArgsConstructor
 @NoArgsConstructor
 public class CouponActivityDTO implements Serializable {