From 88bd6d1e0f0d7c2de7bd8f7de27fac72bae291c7 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 12 Aug 2019 18:24:59 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86=E5=8F=98=E6=9B=B4=E8=AE=B0?= =?UTF-8?q?=E5=BD=95][=E4=BF=AE=E6=94=B9][=E8=8E=B7=E5=8F=96=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E7=BB=9F=E8=AE=A1=E4=BF=A1=E6=81=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mem/WxCreditHistoryController.java | 9 ++++++ .../mapper/WxCreditHistoryMapper.java | 16 ++++++++-- .../service/WxCreditHistoryService.java | 3 ++ .../impl/WxCreditHistoryServiceImpl.java | 16 ++++++++++ .../mapper/WxCreditHistoryMapper.xml | 32 +++++++++++++++++++ 5 files changed, 74 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java index 4d64a734c..2b6430187 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -97,4 +97,13 @@ public class WxCreditHistoryController extends BaseController { wxCreditHistoryService.exportData(request, response, wxCreditHistory); } + @ApiOperation("积分统计概览") + @GetMapping("getCreditSummary") + @SystemControllerLog(description = "积分历史-积分统计概览") + public ResultData getCreditSummary(@ModelAttribute WxCreditHistory wxCreditHistory) { + logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::getCreditSummary"); + wxCreditHistory.setTenantId(getTenantId()); + return wxCreditHistoryService.getCreditSummary(wxCreditHistory); + } + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java index 5fb277662..88e4127e6 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java @@ -1,10 +1,11 @@ package com.iformall.mapper; -import java.util.*; import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxCreditHistory; import com.iformall.domain.vo.WxCreditHistoryNewIdVo; import com.iformall.domain.vo.WxCreditHistoryVo; -import com.iformall.domain.po.WxCreditHistory; + +import java.util.List; public interface WxCreditHistoryMapper extends CommonMapper { @@ -20,4 +21,15 @@ public interface WxCreditHistoryMapper extends CommonMapper result = new HashMap<>(4); + result.put("totalCreditAmount", totalCreditAmount); + result.put("incrementCreditAmount", incrementCreditAmount); + result.put("decrementCreditAmount", decrementCreditAmount); + result.put("peopleCount", peopleCount); + return new ResultData(result); + } + @Override public PageInfo listAsPage(WxCreditHistory record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCreditHistoryMapper.findList(record)); diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index cf08e5116..82de3f60c 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -206,4 +206,36 @@ where tenant_id=#{tenantId} and c_user_id = #{cUserId} + + + + + + + + +