From b344b1fe1d3e9839efadae66c43733cddc082f8e Mon Sep 17 00:00:00 2001
From: dalong306 <304592994@qq.com>
Date: Thu, 28 Apr 2022 14:12:38 +0800
Subject: [PATCH] =?UTF-8?q?invice=E5=AF=BC=E5=87=BA=20=E6=B8=A0=E9=81=93?=
 =?UTF-8?q?=E7=BC=BA=E5=B0=91aps?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/tradelog/core/impls/TradeLogServiceImpl.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
index 7bd44636f..086b071d6 100644
--- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
@@ -832,7 +832,8 @@ public class TradeLogServiceImpl implements TradeLogService {
 //    }
     @Override
     public void exportTransFlow(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws Exception {
-        JSONObject transFlow = listPartnerTransFlowByExportPdf(query, partner, new String[]{"Wechat", "Alipay", "AlipayOnline"});
+        logger.info("=======>exportTransFlow");
+        JSONObject transFlow = listPartnerTransFlowByExportPdf(query, partner, new String[]{"Wechat", "Alipay", "AlipayOnline","ApsCashier","ApsInstore"});
         JSONObject analysis = transFlow.getJSONObject("analysis");
         JSONObject client = clientManager.getClientInfo(partner.getIntValue("client_id"));
         Context ctx = new Context();
@@ -1008,7 +1009,8 @@ public class TradeLogServiceImpl implements TradeLogService {
 
     @Override
     public ModelAndView exportTransFlow(TradeLogQuery query, JSONObject partner, Model model) throws Exception {
-        JSONObject transFlow = listPartnerTransFlowByExportPdf(query, partner, new String[]{"Wechat", "Alipay", "AlipayOnline"});
+        logger.info("=======>exportTransFlow::");
+        JSONObject transFlow = listPartnerTransFlowByExportPdf(query, partner, new String[]{"Wechat", "Alipay", "AlipayOnline","ApsCashier","ApsInstore"});
         JSONObject analysis = transFlow.getJSONObject("analysis");
         JSONObject client = clientManager.getClientInfo(partner.getIntValue("client_id"));
         ModelAndView view = new ModelAndView("app/invoice.html");