From 6d78f8ab222498d727e91983d0511d8119d95aa3 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 24 Jan 2022 19:34:42 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderFlowAction.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderFlowAction.java b/zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderFlowAction.java
index a3ad197..c77023d 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderFlowAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderFlowAction.java
@@ -107,7 +107,7 @@
orderSheet.setSheetName("交易流水");
orderSheet.setTitle("交易流水");
String[] header = new String[]{"订单编号", "交易内容", "交易时间", "交易类型", "交易金额", "会员姓名",
- "支付方式", "支付流水号", "操作人", "门店名称"};
+ "支付方式","储值卡名称", "支付流水号", "操作人", "门店名称"};
orderSheet.setHeaders(header);
List<List<Object>> body = new ArrayList<>();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
@@ -120,6 +120,7 @@
bodyItem.add(flowVo.getAmount());
bodyItem.add(flowVo.getVipName());
bodyItem.add(flowVo.getPayMethod());
+ bodyItem.add(flowVo.getCardName());
bodyItem.add(flowVo.getFlowNo());
bodyItem.add(flowVo.getStaffName());
bodyItem.add(flowVo.getShopName());
--
Gitblit v1.9.1