From 8b132d5adce1a858a7eb5a269d87ef87e6c4a798 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 10 May 2021 17:18:20 +0800 Subject: [PATCH] fix neupos --- .../controller/NeuPosAdminController.java | 8 +++++++ .../mapper/NeuPosOrderMasterExtMapper.java | 2 ++ .../iformall/service/NeuPosOrderService.java | 2 ++ .../service/impl/NeuPosOrderServiceImpl.java | 10 +++++++- .../mapper/NeuPosOrderMasterExtMapper.xml | 24 +++++++++++++++++++ 5 files changed, 45 insertions(+), 1 deletion(-) diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java index 9500a22f8..1b4a5cd33 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java @@ -58,6 +58,14 @@ public class NeuPosAdminController extends BaseController { return new ResultData(maplist); } + @ApiOperation("集团类型流水总数") + @GetMapping("payTypeOrderSum") + public ResultData payTypeOrderSum(@ModelAttribute NeuPosOrderMasterExt example) { + example.setOrgId(24); + List maplist = neuPosOrderService.queryShopPayOrderSum(example); + return new ResultData(maplist); + } + @ApiOperation("门店流水") @GetMapping("shopOrderlist") @ApiImplicitParams({ diff --git a/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java b/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java index 1271d8c39..a4759d48c 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java @@ -15,6 +15,8 @@ public interface NeuPosOrderMasterExtMapper extends BaseMapper queryShopPayOrderList(NeuPosOrderMasterExt example); + List queryShopPayOrderSum(NeuPosOrderMasterExt example); + List selectShopList(@Param("orgId") Integer orgId); List selectPayTypeList(); diff --git a/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java b/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java index e5e4c23bc..cca20553b 100644 --- a/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java @@ -14,6 +14,8 @@ public interface NeuPosOrderService { */ PageInfo queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize); + List queryShopPayOrderSum(NeuPosOrderMasterExt example); + /** * 门店类型流水 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java index b2f0792b1..3a24c6c4a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java @@ -34,7 +34,7 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { public PageInfo queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> posOrderMapper.queryShopPayOrderList(example)); if (null == pageInfo || null == pageInfo.getList() || pageInfo.getList().size()<=0 ) { - return null; + return pageInfo; } List payOrderList = pageInfo.getList(); List payTypeMap = posOrderMapper.selectPayTypeList(); @@ -58,6 +58,12 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { return pageInfo; } + @Override + public List queryShopPayOrderSum(NeuPosOrderMasterExt example) { + return posOrderMapper.queryShopPayOrderSum(example); + } + + @Override public List selectPayTypeList() { return posOrderMapper.selectPayTypeList(); @@ -67,5 +73,7 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { public PageInfo queryOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> posOrderMapper.queryOrderList(example)); } + + } diff --git a/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml b/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml index 015182e95..dcc2a765a 100644 --- a/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml +++ b/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml @@ -49,6 +49,30 @@ GROUP BY pay_type + +