From 42cfdb31e96bf87899f95146b01d4b871a4ad905 Mon Sep 17 00:00:00 2001 From: hanxueda Date: Wed, 17 Apr 2019 14:17:37 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E4=BF=AE=E6=94=B9]:C?= =?UTF-8?q?=E7=AB=AF=E7=94=A8=E6=88=B7=E5=85=91=E6=8D=A2=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxCreditHistoryController.java | 5 ++++- .../src/main/resources/mapper/WxCreditHistoryMapper.xml | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 600e1c750..38ce41965 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCreditHistory; import com.iformall.domain.vo.WxCreditHistoryVo; +import com.iformall.enums.EnumScoreType; import com.iformall.service.WxCreditHistoryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -32,7 +33,7 @@ public class WxCreditHistoryController extends BaseController{ return new ResultData(); } - @ApiOperation("分页列表接口") + @ApiOperation("用户积分兑换记录") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -40,6 +41,8 @@ public class WxCreditHistoryController extends BaseController{ public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) { log.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); + wxCreditHistory.setCUserId(getUserId()); + wxCreditHistory.setCreditType(EnumScoreType.CHANGE_CREDIT.getCode()); final PageInfo page = wxCreditHistoryService.listAsPageMore(wxCreditHistory, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index 6500521fb..c82c4f06e 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -93,6 +93,9 @@ and `operator_id` = #{operatorId} + + and `credit_type` = #{creditType} +