代金券列表

alien-entity/src/main/java/shop/alien/entity/store/vo/CouponAndEventVo.java

@@ -0,0 +1,23 @@
+package shop.alien.entity.store.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+
+@Data
+@JsonInclude
+@NoArgsConstructor
+@ApiModel(value = "代金券和营销活动", description = "代金券和营销活动")
+public class CouponAndEventVo {
+
+    @ApiModelProperty(value = "代金券")
+    private List<LifeCouponVo> couponList;
+
+    @ApiModelProperty(value = "营销活动")
+    private List<String> marketingList;
+}

alien-store/src/main/java/shop/alien/store/controller/LifeCouponController.java

@@ -79,7 +79,7 @@ public class LifeCouponController {
         return R.data(lifeCouponService.getOne(objectLambdaQueryWrapper));
     }
 
-    @ApiOperation("代金卷详情")
+    @ApiOperation("代金劵详情")
     @GetMapping("/getNewCouponDetail")
     private R<LifeCouponVo> getNewCouponDetail(@RequestParam("id") String id) {
         log.info("LifeCouponController.getNewCouponDetail?id={}", id);