From 955a004a73e0279476a55f1b4d2296d834f750eb Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 26 Dec 2018 15:23:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=82=A8=E5=80=BC=E5=8D=A1][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]:=E6=B6=88=E8=B4=B9=E8=AE=B0=E5=BD=95sum=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCardPayController.java | 3 ++- .../controller/WxCardPayController.java | 4 +++- .../iformall/mapper/WxCardSpendMapper.java | 4 +++- .../iformall/service/WxCardSpendService.java | 10 ++++++++- .../service/impl/WxCardSpendServiceImpl.java | 9 ++++++-- .../resources/mapper/WxCardSpendMapper.xml | 21 +++++++++++++++++-- 6 files changed, 43 insertions(+), 8 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java index ca4d195b5..9905ba768 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -61,7 +61,8 @@ public class WxCardPayController extends BaseController { if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); WxMerchantBUser user = getUser(); wxCardSpend.setTenantId(user.getTenantId()); - final Map map = wxCardSpendService.sumCardSpend(wxCardSpend); + wxCardSpend.setMerchantId(user.getMerchantId()); + final Map map = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); return new ResultData(map); } } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java index f2f4866e5..668c99134 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -148,6 +148,7 @@ public class WxCardPayController extends BaseController { if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); WxCUser user = getUser(); wxCardSpend.setTenantId(user.getTenantId()); + wxCardSpend.setOwnerId(user.getId()); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); return new ResultData(page); } @@ -160,7 +161,8 @@ public class WxCardPayController extends BaseController { if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); WxCUser user = getUser(); wxCardSpend.setTenantId(user.getTenantId()); - final Map map = wxCardSpendService.sumCardSpend(wxCardSpend); + wxCardSpend.setOwnerId(user.getId()); + final Map map = wxCardSpendService.sumCardSpendForOwner(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 bf1375156..c0d666a18 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java @@ -13,7 +13,9 @@ public interface WxCardSpendMapper extends CommonMapper { List findCardSpendVoList(WxCardSpend wxCardSpend); - Map sumCardSpendVo(WxCardSpend wxCardSpend); + Map sumCardSpendVoForMerchant(WxCardSpend wxCardSpend); + + Map sumCardSpendVoForOwner(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 d4ae3d7de..f71e0c672 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java @@ -42,7 +42,15 @@ public interface WxCardSpendService { * @param record * @return */ - Map sumCardSpend(WxCardSpendVo record); + Map sumCardSpendForMerchant(WxCardSpendVo record); + + /** + * 根据实体SUM + * + * @param record + * @return + */ + Map sumCardSpendForOwner(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 ab5d57c1e..f50a97d85 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -247,8 +247,13 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } @Override - public Map sumCardSpend(WxCardSpendVo record) { - return wxCardSpendMapper.sumCardSpendVo(record); + public Map sumCardSpendForMerchant(WxCardSpendVo record) { + return wxCardSpendMapper.sumCardSpendVoForMerchant(record); + } + + @Override + public Map sumCardSpendForOwner(WxCardSpendVo record) { + return wxCardSpendMapper.sumCardSpendVoForOwner(record); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index 71492a2de..10c730921 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -224,8 +224,8 @@ - + select cs.merchant_id, m.name as merchantName, IFNULL(SUM(cs.`deduction_amount`),0) as sum_deduction_amount, IFNULL(SUM(cs.`payment`),0) as sum_payment, IFNULL(SUM(cs.`real_payment`),0) as sum_real_payment, @@ -240,6 +240,23 @@ group by cs.merchant_id + +