Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

7 years ago · 3c1c6e7219
parent 41b993e995 5052f5f7d6
commit 3c1c6e7219
2 changed files with 2 additions and 2 deletions
--- 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"));
                    }
                }
            }
--- 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