From d65aee9f8388c4074f0301675a35b74a3671439e Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 10 May 2021 15:52:29 +0800 Subject: [PATCH] fix --- .../logPath_IS_UNDEFINED/debug.log | 0 .../logPath_IS_UNDEFINED/error.log | 0 .../logPath_IS_UNDEFINED/info.log | 0 .../logPath_IS_UNDEFINED/trace.log | 0 .../logPath_IS_UNDEFINED/warn.log | 0 .../controller/NeuPosAdminController.java | 16 ++++++--- .../iformall/service/NeuPosOrderService.java | 6 ++-- .../service/impl/NeuPosOrderServiceImpl.java | 33 ++++++++++--------- 8 files changed, 31 insertions(+), 24 deletions(-) create mode 100644 mallinkNeuPosAdmin/logPath_IS_UNDEFINED/debug.log create mode 100644 mallinkNeuPosAdmin/logPath_IS_UNDEFINED/error.log create mode 100644 mallinkNeuPosAdmin/logPath_IS_UNDEFINED/info.log create mode 100644 mallinkNeuPosAdmin/logPath_IS_UNDEFINED/trace.log create mode 100644 mallinkNeuPosAdmin/logPath_IS_UNDEFINED/warn.log diff --git a/mallinkNeuPosAdmin/logPath_IS_UNDEFINED/debug.log b/mallinkNeuPosAdmin/logPath_IS_UNDEFINED/debug.log new file mode 100644 index 000000000..e69de29bb diff --git a/mallinkNeuPosAdmin/logPath_IS_UNDEFINED/error.log b/mallinkNeuPosAdmin/logPath_IS_UNDEFINED/error.log new file mode 100644 index 000000000..e69de29bb diff --git a/mallinkNeuPosAdmin/logPath_IS_UNDEFINED/info.log b/mallinkNeuPosAdmin/logPath_IS_UNDEFINED/info.log new file mode 100644 index 000000000..e69de29bb diff --git a/mallinkNeuPosAdmin/logPath_IS_UNDEFINED/trace.log b/mallinkNeuPosAdmin/logPath_IS_UNDEFINED/trace.log new file mode 100644 index 000000000..e69de29bb diff --git a/mallinkNeuPosAdmin/logPath_IS_UNDEFINED/warn.log b/mallinkNeuPosAdmin/logPath_IS_UNDEFINED/warn.log new file mode 100644 index 000000000..e69de29bb diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java index 426ff4dfe..9500a22f8 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java @@ -49,17 +49,23 @@ public class NeuPosAdminController extends BaseController { @ApiOperation("集团类型流水") @GetMapping("payTypeOrderlist") - public ResultData payTypeOrderlist(@ModelAttribute NeuPosOrderMasterExt example) { + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData payTypeOrderlist(@ModelAttribute NeuPosOrderMasterExt example, Integer pageNum, Integer pageSize) { example.setOrgId(24); - List maplist = neuPosOrderService.queryShopPayOrderList(example); + PageInfo maplist = neuPosOrderService.queryShopPayOrderList(example,pageNum,pageSize); return new ResultData(maplist); } @ApiOperation("门店流水") @GetMapping("shopOrderlist") - public ResultData shopOrderlist(@ModelAttribute NeuPosOrderMasterExt example) { + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData shopOrderlist(@ModelAttribute NeuPosOrderMasterExt example, Integer pageNum, Integer pageSize) { example.setOrgId(24); - List maplist = neuPosOrderService.queryShopPayTypeTradeList(example); + PageInfo maplist = neuPosOrderService.queryShopPayTypeTradeList(example,pageNum,pageSize); return new ResultData(maplist); } @@ -70,7 +76,7 @@ public class NeuPosAdminController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData orderlist(@ModelAttribute NeuPosOrderMasterExt example, Integer pageNum, Integer pageSize) { example.setOrgId(24); - PageInfo> maplist = neuPosOrderService.queryOrderList(example,pageNum,pageSize); + PageInfo maplist = neuPosOrderService.queryOrderList(example,pageNum,pageSize); return new ResultData(maplist); } } diff --git a/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java b/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java index 12e7d3dfc..e5e4c23bc 100644 --- a/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java @@ -12,7 +12,7 @@ public interface NeuPosOrderService { * @param example * @return */ - List queryShopPayOrderList(NeuPosOrderMasterExt example); + PageInfo queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize); /** @@ -20,11 +20,11 @@ public interface NeuPosOrderService { * @param example * @return */ - List queryShopPayTypeTradeList(NeuPosOrderMasterExt example); + PageInfo queryShopPayTypeTradeList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize); List selectShopList(Integer orgId); List selectPayTypeList(); - PageInfo> queryOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize); + PageInfo queryOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize); } 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 df136b289..b2f0792b1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java @@ -21,8 +21,8 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { NeuPosOrderMasterExtMapper posOrderMapper; @Override - public List queryShopPayTypeTradeList(NeuPosOrderMasterExt example) { - return posOrderMapper.queryShopPayTypeTradeList(example); + public PageInfo queryShopPayTypeTradeList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> posOrderMapper.queryShopPayTypeTradeList(example)); } @Override @@ -31,30 +31,31 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { } @Override - public List queryShopPayOrderList(NeuPosOrderMasterExt example) { - List payOrderList = posOrderMapper.queryShopPayOrderList(example); + 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; + } + List payOrderList = pageInfo.getList(); List payTypeMap = posOrderMapper.selectPayTypeList(); Map typeMap = new HashMap(); for (Map payt:payTypeMap) { typeMap.put(Integer.parseInt((String)payt.get("pay_type")), (String)payt.get("name")); } - List relist = new ArrayList(); for (Map payOrder:payOrderList ) { Integer payType = Integer.parseInt((String)payOrder.get("payType")); if (null != payType && typeMap.containsKey(payType)) { - Map map = new HashMap(); - map.put("payType",typeMap.get(payType).toString()); - map.put("payAmount",BigDecimal.valueOf(Double.valueOf(payOrder.get("payAmount").toString()))); - map.put("payCount",Integer.parseInt(payOrder.get("payCount").toString())); - map.put("refundAmount",BigDecimal.valueOf(Double.valueOf(payOrder.get("refundAmount").toString()))); - map.put("refundCount",Integer.parseInt(payOrder.get("refundCount").toString())); - map.put("amount",BigDecimal.valueOf(Double.valueOf(payOrder.get("amount").toString()))); - map.put("discountAmount",BigDecimal.valueOf(Double.valueOf(payOrder.get("discountAmount").toString()))); - relist.add(map); + payOrder.put("payTypeName",typeMap.get(payType).toString()); +// map.put("payAmount",BigDecimal.valueOf(Double.valueOf(payOrder.get("payAmount").toString()))); +// map.put("payCount",Integer.parseInt(payOrder.get("payCount").toString())); +// map.put("refundAmount",BigDecimal.valueOf(Double.valueOf(payOrder.get("refundAmount").toString()))); +// map.put("refundCount",Integer.parseInt(payOrder.get("refundCount").toString())); +// map.put("amount",BigDecimal.valueOf(Double.valueOf(payOrder.get("amount").toString()))); +// map.put("discountAmount",BigDecimal.valueOf(Double.valueOf(payOrder.get("discountAmount").toString()))); } } - return relist; + return pageInfo; } @Override @@ -63,7 +64,7 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { } @Override - public PageInfo> queryOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { + public PageInfo queryOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> posOrderMapper.queryOrderList(example)); }