From 057e1f6ffcfbb52f26c832e5cd47a3cd18c96126 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 27 Jun 2019 13:36:03 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BD=9C=E5=BA=9F=E5=AE=A1=E6=89=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/market/WxCouponController.java | 1 + .../java/com/iformall/controller/sys/WxBusinessController.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index cf53a7283..a63f2ecbd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -122,6 +122,7 @@ public class WxCouponController extends BaseController { //作废审批 if (EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode().equals(wxCoupon.getStatus())) { wxCoupon.setCancleApplyStatus(EnumRentContractAppStatus.APPLYING.getCode()); + return new ResultData(wxCoupon); }else{ //投放审批 wxCoupon.setPutApplyStatus(EnumRentContractAppStatus.APPLYING.getCode()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java index 552eaaa1c..8e25fa02d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -92,7 +92,7 @@ public class WxBusinessController extends BaseController { @ApiOperation("贡献率排行") @GetMapping("devoteList") - @SystemControllerLog(description = "业态分析接口") + @SystemControllerLog(description = "贡献率排行") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})