From b21dfb9e59a1d2a9384ec7e409925539d4e1a92b Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 26 Dec 2018 15:53:25 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=82=A8=E5=80=BC=E5=8D=A1][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]:=E5=8D=A1=E6=B6=88=E8=B4=B9=E6=B5=81=E6=B0=B4sum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCardPayController.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java index 0a9a41fa7..b06f92989 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java @@ -4,10 +4,7 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.MallUserInfo; -import com.iformall.domain.po.WxCardInfo; -import com.iformall.domain.po.WxCardSpend; -import com.iformall.domain.po.WxCouponOrder; +import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCardSpendVo; import com.iformall.domain.vo.WxCardVo; import com.iformall.enums.EnumCardSpendStatus; @@ -30,6 +27,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; /** * @author Stormeye Wu wuguoqiang@iformall.com @@ -102,8 +100,20 @@ public class WxCardPayController extends BaseController { return new ResultData(page); } + @ApiOperation("C端扫B端储值卡交易流水SUM") + @GetMapping("sum") + public ResultData sumCardSpendList(@ModelAttribute WxCardSpendVo wxCardSpend) { + String ipStr = getIpAddr(); + logger.info("sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); + if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); + MallUserInfo user = getUser(); + wxCardSpend.setTenantId(user.getTenantId()); + final Map map = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); + return new ResultData(map); + } + @ApiOperation("交易流水导出") - @RequestMapping("/exportData") + @GetMapping("/exportData") public void exportData(@ModelAttribute WxCardSpendVo wxCardSpendVo, HttpServletRequest request, HttpServletResponse response) { logger.info("[" + getIpAddr() + "] WxCardPayController::exportData"); wxCardSpendVo.setTenantId(getTenantId());