diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java index 1e2be7f5e..be5e3c721 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java @@ -105,8 +105,8 @@ public class NeuPosAdminController extends BaseController { example.setOrgId(24); PageInfo maplist = neuPosOrderService.queryShopPayOrderList(example,1,10000); if (null != maplist && null != maplist.getList()) { - neuPosOrderService.exportData(maplist.getList(),new String[] {"支付方式","消费金额","折扣金额","消费笔数","退款金额","退款笔数","实收金额"}, - new String[] {"payTypeName","payAmount","discountAmount","payCount","refundAmount","refundCount","amount"},"pos交易汇总",new NeuPosSumDataBVo(), request, response); + neuPosOrderService.exportData(maplist.getList(),new String[] {"商户","消费金额","折扣金额","消费笔数","退款金额","退款笔数","实收金额"}, + new String[] {"shopName","payAmount","discountAmount","payCount","refundAmount","refundCount","amount"},"商户pos交易汇总",new NeuPosSumDataBVo(), request, response); } } diff --git a/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java b/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java index 05da75009..4ecd2a5e2 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java @@ -14,9 +14,11 @@ public interface NeuPosOrderMasterExtMapper extends BaseMapper queryShopPayTypeTradeList(NeuPosOrderMasterExt example); - List queryShopPayOrderList(NeuPosOrderMasterExt example); + //List queryShopPayOrderList(NeuPosOrderMasterExt example); + List queryShopPayOrderListV1(NeuPosOrderMasterExt example); - List queryShopPayOrderSum(NeuPosOrderMasterExt example); + //List queryShopPayOrderSum(NeuPosOrderMasterExt example); + List queryShopPayOrderSumV1(NeuPosOrderMasterExt example); List selectShopList(@Param("orgId") Integer orgId); 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 6ac65e74c..9fe8282c1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java @@ -36,26 +36,56 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { return neuPosOrderMasterExtMapper.selectShopList(orgId); } +// @Override +// public PageInfo queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { +// List orgPayType = neuPosOrderMasterExtMapper.selectOrgPayType(example.getOrgId()); +// example.setPayTypeList(orgPayType); +// PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> neuPosOrderMasterExtMapper.queryShopPayOrderList(example)); +// if (null == pageInfo || null == pageInfo.getList() || pageInfo.getList().size()<=0 ) { +// return pageInfo; +// } +// List payOrderList = pageInfo.getList(); +// List payTypeMap = neuPosOrderMasterExtMapper.selectPayTypeList(); +// Map typeMap = new HashMap(); +// for (Map payt:payTypeMap) { +// String payttye = (String)payt.get("pay_type"); +// 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)) { +// 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 pageInfo; +// } + @Override public PageInfo queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { List orgPayType = neuPosOrderMasterExtMapper.selectOrgPayType(example.getOrgId()); example.setPayTypeList(orgPayType); - PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> neuPosOrderMasterExtMapper.queryShopPayOrderList(example)); + PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> neuPosOrderMasterExtMapper.queryShopPayOrderListV1(example)); if (null == pageInfo || null == pageInfo.getList() || pageInfo.getList().size()<=0 ) { return pageInfo; } List payOrderList = pageInfo.getList(); - List payTypeMap = neuPosOrderMasterExtMapper.selectPayTypeList(); - Map typeMap = new HashMap(); - for (Map payt:payTypeMap) { - String payttye = (String)payt.get("pay_type"); - typeMap.put(Integer.parseInt(payttye), (String)payt.get("name")); + List shopMap = neuPosOrderMasterExtMapper.selectShopList(example.getOrgId()); + Map sMap = new HashMap(); + for (Map payt:shopMap) { + Integer payttye = (Integer)payt.get("id"); + sMap.put(payttye, (String)payt.get("name")); } - for (Map payOrder:payOrderList ) { - Integer payType = Integer.parseInt((String)payOrder.get("payType")); - if (null != payType && typeMap.containsKey(payType)) { - payOrder.put("payTypeName",typeMap.get(payType).toString()); + Integer shopId = Integer.parseInt((String)payOrder.get("shopId")); + if (null != shopId && sMap.containsKey(shopId)) { + payOrder.put("shopName",sMap.get(shopId)); // 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()))); @@ -66,10 +96,11 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { } return pageInfo; } - + @Override public List queryShopPayOrderSum(NeuPosOrderMasterExt example) { - return neuPosOrderMasterExtMapper.queryShopPayOrderSum(example); + //return neuPosOrderMasterExtMapper.queryShopPayOrderSum(example); + return neuPosOrderMasterExtMapper.queryShopPayOrderSumV1(example); } diff --git a/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml b/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml index 1b7525217..14939545e 100644 --- a/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml +++ b/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml @@ -30,7 +30,92 @@ where org_id = #{orgId} - + + + + + + - select id,name from `shop` where status = 1