From a1229b5669d5e2fd7219491e255bc4b0abeda27d Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 22 Dec 2018 11:23:38 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7=E8=A1=A5=E8=B4=B4][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=9B=B4=E6=96=B0=E8=A1=A5=E8=B4=B4?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxMerchantSubsidyController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java index b13526abf..c06d59bd7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java @@ -5,7 +5,9 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxMerchantSubsidy; import com.iformall.domain.vo.WxMerchantSubsidyVo; +import com.iformall.enums.EnumMerchantSubsidyStatus; import com.iformall.service.WxMerchantSubsidyService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -18,6 +20,7 @@ import java.util.Date; import java.util.Map; @RestController +@Api(description = "商户补贴接口") @RequestMapping("subsidy") public class WxMerchantSubsidyController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -53,13 +56,14 @@ public class WxMerchantSubsidyController extends BaseController { } @ApiOperation("更新补贴记录") - @PostMapping("update") + @PostMapping("updateSubsidied") public ResultData listMonth(@RequestBody WxMerchantSubsidy wxMerchantSubsidy) { String ipStr = getIpAddr(); logger.info("subsidy/update: " + ipStr + " :" + wxMerchantSubsidy.toString()); if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidy(); MallUserInfo user = getUser(); wxMerchantSubsidy.setTenantId(user.getTenantId()); + wxMerchantSubsidy.setStatus(EnumMerchantSubsidyStatus.SUBSIDIED.getCode()); wxMerchantSubsidy.setUpdateDate(new Date()); return wxMerchantSubsidyService.saveOrUpdate(wxMerchantSubsidy); }