Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/CouponPagVo.java

 package com.xxfc.platform.activity.vo;
 
+import com.xxfc.platform.activity.entity.Coupon;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
 import java.math.BigDecimal;
 
 /**
@@ -12,7 +14,7 @@ import java.math.BigDecimal;
  * @data 2019/7/23 10:55
  */
 @Data
-public class CouponPagVo {
+public class CouponPagVo extends Coupon {
 
 
     @ApiModelProperty("主键id")
@@ -54,4 +56,18 @@ public class CouponPagVo {
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Long crtTime;
 
+    /**
+     *  发放开始时间
+     */
+    @Column(name = "start_time")
+    @ApiModelProperty(value = "发放开始时间")
+    private Long startTime;
+
+    /**
+     *  发放结束时间
+     */
+    @Column(name = "end_time")
+    @ApiModelProperty(value = "发放结束时间")
+    private Long endTime;
+
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/admin/CouponAdminController.java

@@ -42,8 +42,8 @@ public class CouponAdminController implements UserRestInterface {
 
 
     @ApiOperation("优惠券列表")
-    @GetMapping("/page")
-    public ObjectRestResponse<PageDataVO<CouponPagVo>> listCouponWithPage(CouponFindDTO couponFindDTO) {
+    @GetMapping("/business/page")
+    public ObjectRestResponse<PageDataVO<CouponPagVo>> listBusinessCouponWithPage(CouponFindDTO couponFindDTO) {
         DataInterBean dataInterBean = getDataInter();
         couponFindDTO.setBizType(dataInterBean.getBizType());
         couponFindDTO.setCompanyIds(dataInterBean.getDataCompanyIds());
@@ -52,16 +52,15 @@ public class CouponAdminController implements UserRestInterface {
         return ObjectRestResponse.succ(couponPage);
     }
 
-//    @ApiOperation("优惠券列表")
-//    @GetMapping("/operate/page")
-//    public ObjectRestResponse<PageDataVO<CouponPagVo>> listCouponWithPage(CouponFindDTO couponFindDTO) {
-//        DataInterBean dataInterBean = getDataInter();
-//        couponFindDTO.setBizType(dataInterBean.getBizType());
-//        couponFindDTO.setCompanyIds(dataInterBean.getDataCompanyIds());
-//        //设置参数过滤
-//        PageDataVO<CouponPagVo> couponPage = couponBiz.listCouponWithPage(couponFindDTO);
-//        return ObjectRestResponse.succ(couponPage);
-//    }
+    @ApiOperation("优惠券列表")
+    @GetMapping("/operate/page")
+    public ObjectRestResponse<PageDataVO<CouponPagVo>> listOperateCouponWithPage(CouponFindDTO couponFindDTO) {
+        DataInterBean dataInterBean = getDataInter();
+        couponFindDTO.setBizType(dataInterBean.getBizType());
+        //设置参数过滤
+        PageDataVO<CouponPagVo> couponPage = couponBiz.listCouponWithPage(couponFindDTO);
+        return ObjectRestResponse.succ(couponPage);
+    }
 
     @ApiOperation("查询优惠券详情")
     @GetMapping("/{id}")
@@ -77,7 +76,7 @@ public class CouponAdminController implements UserRestInterface {
       return   ObjectRestResponse.succ(titles);
     }
     @ApiOperation("优惠劵新增 或 编辑")
-    @PostMapping
+    @PostMapping("/operate")
     public ObjectRestResponse<Void> addCoupon(@RequestBody CouponDTO couponDTO, UserDTO userDTO){
         couponBiz.addCoupon(couponDTO,userDTO);
         return ObjectRestResponse.succ();