From aef4b6e1dab1909b5014ebba02ca9a6573b7b0a1 Mon Sep 17 00:00:00 2001
From: dalong306 <304592994@qq.com>
Date: Sun, 26 Sep 2021 17:38:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E6=B8=A0=E9=81=93?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impls/RetailAppServiceImp.java        | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
index 3b2640be1..567a8ca1b 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
@@ -1001,6 +1001,12 @@ public class RetailAppServiceImp implements RetailAppService {
             if ("CNY".equals(order.getString("currency"))) {
                 order.put("clearing_amount", order.getBigDecimal("total_amount"));
             }
+            if("ApsInStore".equalsIgnoreCase(order.getString("channel"))){
+                order.put("channel", "Alipay+");
+            }
+            if("ApsCashier".equalsIgnoreCase(order.getString("channel"))){
+                order.put("channel", "Alipay+(Online)");
+            }
             if (!dateContains.contains(tradeDate)) {
                 String reDate = tradeDate.replace("-", "");
                 AppQueryBean dateQuery = new AppQueryBean();
@@ -3116,6 +3122,18 @@ public class RetailAppServiceImp implements RetailAppService {
         if (cardPaymentPay.containsKey("channel")) {
             channels.add(cardPaymentPay);
         }
+
+        JSONObject apsInStore = getChannel(clientId, now, "ApsInStore");
+        if (apsInStore.containsKey("channel")) {
+            apsInStore.put("channel","Alipay+");
+            channels.add(apsInStore);
+        }
+        JSONObject apsCashier = getChannel(clientId, now, "ApsCashier");
+        if (apsCashier.containsKey("channel")) {
+            apsCashier.put("channel","Alipay+(Online)");
+
+            channels.add(apsCashier);
+        }
         res.put("channels", channels);
         if (res.containsKey("rate_value")) {
             BigDecimal minRate = res.getBigDecimal("rate_value").add(BigDecimal.valueOf(0.01)).setScale(2, RoundingMode.DOWN);