From 52d642cd60b116c473f2e442f2d8e325620e1b43 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 24 Dec 2018 11:19:01 +0800 Subject: [PATCH] =?UTF-8?q?B=E7=AB=AF=E5=8D=A1=E5=8C=85=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E6=B5=81=E6=B0=B4SUM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxCardPayController.java | 14 ++++++++++++++ .../com/iformall/mapper/WxCardSpendMapper.java | 4 ++-- .../com/iformall/service/WxCardSpendService.java | 10 ++++++++++ .../service/impl/WxCardSpendServiceImpl.java | 6 ++++++ .../main/resources/mapper/WxCardSpendMapper.xml | 15 ++++++++++++++- 5 files changed, 46 insertions(+), 3 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java index 5e7ad5c5e..7cafa68c4 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -17,6 +17,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Map; + /** * @author Stormeye Wu wuguoqiang@iformall.com */ @@ -50,4 +52,16 @@ public class WxCardPayController extends BaseController { final PageInfo page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); return new ResultData(page); } + + @ApiOperation("C端扫B端储值卡交易流水SUM") + @GetMapping("sum") + public ResultData sumCardOrderList(@ModelAttribute WxCardSpendVo wxCardSpend) { + String ipStr = getIpAddr(); + logger.info("sumCardOrderList: " + ipStr + " :" + wxCardSpend.toString()); + if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); + WxMerchantBUser user = getUser(); + wxCardSpend.setTenantId(user.getTenantId()); + final Map map = wxCardSpendService.sumCardSpend(wxCardSpend); + return new ResultData(map); + } } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java index 383ee6de1..5d175017c 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java @@ -10,8 +10,8 @@ public interface WxCardSpendMapper extends CommonMapper { List findList(WxCardSpend wxCardSpend); List findCardSpendVoList(WxCardSpend wxCardSpend); - - + + Map sumCardSpendVo(WxCardSpend wxCardSpend); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java b/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java index 6c34e2ea9..77f641114 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java @@ -5,6 +5,8 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCardSpendVo; +import java.util.Map; + public interface WxCardSpendService { /** @@ -29,6 +31,14 @@ public interface WxCardSpendService { * @return */ PageInfo listAsPage(WxCardSpendVo record, Integer pageIndex, Integer pageSize); + + /** + * 根据实体SUM + * + * @param record + * @return + */ + Map sumCardSpend(WxCardSpendVo record); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 3a045d99c..90b8694b9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -21,6 +21,7 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.Date; +import java.util.Map; @Service public class WxCardSpendServiceImpl implements WxCardSpendService { @@ -218,6 +219,11 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCardSpendMapper.findCardSpendVoList(record)); } + @Override + public Map sumCardSpend(WxCardSpendVo record) { + return wxCardSpendMapper.sumCardSpendVo(record); + } + @Override public WxCardSpend getById(Long id) { return wxCardSpendMapper.selectByPrimaryKey(id); diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index 26741174e..136a3b228 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -198,7 +198,20 @@ left join wx_c_user ou on ou.id = co.owner_id - + +