From 80c5857190138e9b0fddd65c23f604ac4fb62e26 Mon Sep 17 00:00:00 2001 From: Burce Date: Wed, 14 Aug 2019 19:40:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BC=9A=E5=91=98=E7=AD=89?= =?UTF-8?q?=E7=BA=A7=E7=A7=AF=E5=88=86=E5=80=8D=E7=8E=87=E3=80=81=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E7=94=9F=E6=97=A5=E5=88=B8=E7=A7=AF=E5=88=86=E5=80=8D?= =?UTF-8?q?=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxCreditHistoryController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index ecd202fca..b00c9aeff 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -44,8 +44,9 @@ public class WxCreditHistoryController extends BaseController { @GetMapping("/findByMerchantIdAndSpend") @ApiImplicitParams({ @ApiImplicitParam(name="merchantId",value="商户ID",dataType="long", paramType = "query",required=true), - @ApiImplicitParam(name="spend",value="消费金额",dataType="int", paramType = "query",required=true)}) - public ResultData findByMerchantIdAndSpend(@RequestParam Long merchantId, @RequestParam String spendStr) { + @ApiImplicitParam(name="spend",value="消费金额",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name = "userId", value = "会员Id", dataType = "long", paramType = "query", required = true)}) + public ResultData findByMerchantIdAndSpend(@RequestParam Long merchantId, @RequestParam String spendStr,@RequestParam Long userId) { log.debug("[" + getIpAddr() + "] WxCreditHistoryController::findByMerchantIdAndSpend"); WxMerchant wxMerchant = new WxMerchant(); wxMerchant.setStatus(EnumYesOrNo.YES.getCode()); @@ -55,7 +56,7 @@ public class WxCreditHistoryController extends BaseController { if (wxMerchant.getIsAdmin() != EnumYesOrNo.YES.getCode() && merchantId.longValue() != getUser().getMerchantId().longValue()) { return new ResultData(ErrorCode.USER_NO_PERMISSION); } - return new ResultData(wxCreditHistoryService.findByMerchantIdAndSpend(merchantId,spendStr,getTenantId())); + return new ResultData(wxCreditHistoryService.findByMerchantIdAndSpend(merchantId,spendStr,userId,getTenantId())); } @ApiOperation("根据手机号查询接口")