From 246ef08ab8fc128aaf51b809e10a9d9a11865d26 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 6 Feb 2020 09:36:03 +0800
Subject: [PATCH] =?UTF-8?q?1.3.24=20=E5=A2=9E=E5=8A=A0surcharge=5Frate=20?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=90=8E=E7=BB=AD=E6=9C=AA=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                      | 2 +-
 .../manage/appclient/core/impls/RetailRSvcServiceImpl.java   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ba4d16666..bd14ee9e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.23</version>
+    <version>1.3.24</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.4.0</jib-maven-plugin.version>
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java
index 535275a01..f3b570abb 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java
@@ -15,6 +15,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.parser.Feature;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.net.util.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -25,6 +27,7 @@ import java.util.UUID;
 
 @Service
 public class RetailRSvcServiceImpl implements RetailRSvcService {
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     @Resource
     private ClientManager clientManager;
@@ -65,6 +68,7 @@ public class RetailRSvcServiceImpl implements RetailRSvcService {
         result.put("timestamp", System.currentTimeMillis());
         result = JSONObject.parseObject(JSON.toJSONString(result), Feature.OrderedField);
         result.put("sign", SignUtils.buildSign(result.toJSONString(), svcInfo.getString("platform_pri_key")));
+        logger.info("svc [{}] info:{}", sourceCode, result.toJSONString());
         return result;
     }
 
@@ -96,6 +100,7 @@ public class RetailRSvcServiceImpl implements RetailRSvcService {
             serviceApply.put("client_id", client.getIntValue("client_id"));
             serviceApply.put("title", params.getString("signData"));
             serviceApply.put("amount", decData(params.getString("signPrice"), key, svcInfo.getString("platform_pri_key")));
+            serviceApply.put("surcharge_rate", decData(params.getString("signRate"), key, svcInfo.getString("platform_pri_key")));
             serviceApply.put("apply_username", params.getString("signName"));
             serviceApply.put("status", 0);
             serviceApply.put("is_valid", 1);