From 9cc683fa301378bd3449d4a1c6501b73a9d67df2 Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Tue, 3 Apr 2018 11:20:20 +0800
Subject: [PATCH] fix

---
 .../manage/appclient/core/impls/RetailAppServiceImp.java        | 2 +-
 src/main/resources/application.properties                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 5007dbe3c..333fe5ce6 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
@@ -1060,7 +1060,7 @@ public class RetailAppServiceImp implements RetailAppService {
                     }
                 }else {
                     if ("Credit".equals(transaction.getString("transaction_type"))){
-                        cny_display_amount = cny_display_amount.add(transaction.getBigDecimal("cny_display_amount"));
+                        cny_display_amount = cny_display_amount.add(transaction.getBigDecimal("display_amount"));
                     }
                 }
             }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index a3e5268f4..672e6befb 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 server.port=5000
 
-spring.profiles.active=local,alipay,bestpay,jd,wechat
+spring.profiles.active=dev,alipay,bestpay,jd,wechat
 
 env.company=RoyalPay