|
|
|
@@ -21,8 +21,8 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { |
|
|
|
NeuPosOrderMasterExtMapper posOrderMapper; |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<Map> queryShopPayTypeTradeList(NeuPosOrderMasterExt example) { |
|
|
|
return posOrderMapper.queryShopPayTypeTradeList(example); |
|
|
|
public PageInfo<Map> 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<Map> queryShopPayOrderList(NeuPosOrderMasterExt example) { |
|
|
|
List<Map> payOrderList = posOrderMapper.queryShopPayOrderList(example); |
|
|
|
public PageInfo<Map> queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { |
|
|
|
PageInfo<Map> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> posOrderMapper.queryShopPayOrderList(example)); |
|
|
|
if (null == pageInfo || null == pageInfo.getList() || pageInfo.getList().size()<=0 ) { |
|
|
|
return null; |
|
|
|
} |
|
|
|
List<Map> payOrderList = pageInfo.getList(); |
|
|
|
List<Map> payTypeMap = posOrderMapper.selectPayTypeList(); |
|
|
|
Map<Integer,String> typeMap = new HashMap<Integer,String>(); |
|
|
|
for (Map payt:payTypeMap) { |
|
|
|
typeMap.put(Integer.parseInt((String)payt.get("pay_type")), (String)payt.get("name")); |
|
|
|
} |
|
|
|
|
|
|
|
List<Map> relist = new ArrayList<Map>(); |
|
|
|
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<List<Map>> queryOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { |
|
|
|
public PageInfo<Map> queryOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { |
|
|
|
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> posOrderMapper.queryOrderList(example)); |
|
|
|
} |
|
|
|
|
|
|
|
|