winter 2 лет назад
Родитель
Сommit
7bea9e48f2
2 измененных файлов: 3 добавлений и 3 удалений
  1. +2
    -2
      mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java

+ 2
- 2
mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java Просмотреть файл

@@ -105,8 +105,8 @@ public class NeuPosAdminController extends BaseController {
example.setOrgId(24);
PageInfo<Map> 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);
}
}


+ 1
- 1
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())));


Загрузка…
Отмена
Сохранить