diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java index be5e3c721..97e680eb7 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[] {"shopName","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/service/impl/NeuPosOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java index 9fe8282c1..10f06b4ff 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java @@ -83,7 +83,7 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { sMap.put(payttye, (String)payt.get("name")); } for (Map payOrder:payOrderList ) { - Integer shopId = Integer.parseInt((String)payOrder.get("shopId")); + Integer shopId = (Integer)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())));