车辆相关和优惠券相关

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

@@ -40,8 +40,9 @@ public class CouponAdminController implements UserRestInterface {
         return userFeign;
     }
 
+
     @ApiOperation("优惠券列表")
-    @GetMapping("/operate/page")
+    @GetMapping("/page")
     public ObjectRestResponse<PageDataVO<CouponPagVo>> listCouponWithPage(CouponFindDTO couponFindDTO) {
         DataInterBean dataInterBean = getDataInter();
         couponFindDTO.setBizType(dataInterBean.getBizType());
@@ -51,6 +52,17 @@ 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("/{id}")
     public ObjectRestResponse<CouponVo> findCouponById(@PathVariable(value = "id") Integer id){