From a4d359d2ba58f0179f8db8539f566997e7ae8f95 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sat, 22 May 2021 12:36:10 +0800 Subject: [PATCH] fix neupos --- .../controller/NeuPosAdminController.java | 11 +- .../mapper/NeuPosOrderMasterExtMapper.java | 2 + .../service/impl/NeuPosOrderServiceImpl.java | 14 +- .../mapper/NeuPosOrderMasterExtMapper.xml | 210 +++++++++++------- 4 files changed, 145 insertions(+), 92 deletions(-) diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java index ef723de1b..6c729226e 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java @@ -37,10 +37,11 @@ public class NeuPosAdminController extends BaseController { private boolean tenantValid(String tenantId) { - if (tenantId.equals("1013")) { - return true; - } - return false; +// if (tenantId.equals("1013")) { +// return true; +// } +// return false; + return true; } @ApiOperation("查询门店") @@ -86,7 +87,7 @@ public class NeuPosAdminController extends BaseController { } setDate(example); example.setOrgId(24); - PageInfo maplist = neuPosOrderService.queryShopPayOrderList(example,pageNum,pageSize); + PageInfo maplist = neuPosOrderService.queryShopPayOrderList(example,1,10000); return new ResultData(maplist); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java b/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java index a4759d48c..8814d87fe 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java @@ -21,6 +21,8 @@ public interface NeuPosOrderMasterExtMapper extends BaseMapper selectPayTypeList(); + List selectOrgPayType(@Param("orgId") Integer orgId); + List queryOrderList(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 3a24c6c4a..de81bc5ce 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java @@ -38,11 +38,19 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { } List payOrderList = pageInfo.getList(); List payTypeMap = posOrderMapper.selectPayTypeList(); + List orgPayType = posOrderMapper.selectOrgPayType(example.getOrgId()); Map typeMap = new HashMap(); - for (Map payt:payTypeMap) { - typeMap.put(Integer.parseInt((String)payt.get("pay_type")), (String)payt.get("name")); + for (String _payType : orgPayType) { + if(_payType.equals("29") || _payType.equals("30")) { + continue; + } + for (Map payt:payTypeMap) { + String payttye = (String)payt.get("pay_type"); + if (payttye.equals(_payType)) { + typeMap.put(Integer.parseInt(payttye), (String)payt.get("name")); + } + } } - for (Map payOrder:payOrderList ) { Integer payType = Integer.parseInt((String)payOrder.get("payType")); if (null != payType && typeMap.containsKey(payType)) { diff --git a/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml b/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml index 3e50b3f77..5af7e0a65 100644 --- a/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml +++ b/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml @@ -24,101 +24,143 @@ ORDER BY shop_id asc + +