From 6c235963d6fc46b38ea59d9b19c6519b892e080b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 16 May 2022 09:42:06 +0800
Subject: [PATCH] 20220516  逻辑删除,更新字段IS_Delete字段为已删除,默认为空,删除后其余信息从查询中过滤了

---
 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