| @@ -4,10 +4,7 @@ package com.iformall.controller; | |||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.common.Result; | import com.iformall.common.Result; | ||||
| import com.iformall.common.ResultData; | 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.WxCardSpendVo; | ||||
| import com.iformall.domain.vo.WxCardVo; | import com.iformall.domain.vo.WxCardVo; | ||||
| import com.iformall.enums.EnumCardSpendStatus; | import com.iformall.enums.EnumCardSpendStatus; | ||||
| @@ -30,6 +27,7 @@ import javax.servlet.http.HttpServletResponse; | |||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | import java.util.List; | ||||
| import java.util.Map; | |||||
| /** | /** | ||||
| * @author Stormeye Wu wuguoqiang@iformall.com | * @author Stormeye Wu wuguoqiang@iformall.com | ||||
| @@ -102,8 +100,20 @@ public class WxCardPayController extends BaseController { | |||||
| return new ResultData(page); | 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("交易流水导出") | @ApiOperation("交易流水导出") | ||||
| @RequestMapping("/exportData") | |||||
| @GetMapping("/exportData") | |||||
| public void exportData(@ModelAttribute WxCardSpendVo wxCardSpendVo, HttpServletRequest request, HttpServletResponse response) { | public void exportData(@ModelAttribute WxCardSpendVo wxCardSpendVo, HttpServletRequest request, HttpServletResponse response) { | ||||
| logger.info("[" + getIpAddr() + "] WxCardPayController::exportData"); | logger.info("[" + getIpAddr() + "] WxCardPayController::exportData"); | ||||
| wxCardSpendVo.setTenantId(getTenantId()); | wxCardSpendVo.setTenantId(getTenantId()); | ||||