Browse Source

调整收单接口的返回值。

yujia 8 years ago
parent
commit
8267cd54b2

+ 3 - 2
src/main/java/com/uas/platform/b2c/fa/payment/controller/BankReceiptsController.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2c.fa.payment.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.fa.payment.service.BankReceiptsService;
 import com.uas.platform.b2c.fa.payment.service.BankReceiptsService;
+import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.sso.common.IpHelper;
 import com.uas.sso.common.IpHelper;
 import org.apache.http.HttpStatus;
 import org.apache.http.HttpStatus;
@@ -58,8 +59,8 @@ public class BankReceiptsController {
      * @return String
      * @return String
      */
      */
     @RequestMapping(value = "/unionPay/bindCard/query", method = RequestMethod.GET)
     @RequestMapping(value = "/unionPay/bindCard/query", method = RequestMethod.GET)
-    public String queryBindCard(Boolean isPersonal) {
-        String resultStr = bankReceiptsService.queryBindCard(isPersonal);
+    public ResultMap queryBindCard(Boolean isPersonal) {
+        ResultMap resultStr = bankReceiptsService.queryBindCard(isPersonal);
         logger.log("平安支付控制器", "跨行支付绑卡", "查询绑卡信息");
         logger.log("平安支付控制器", "跨行支付绑卡", "查询绑卡信息");
         return resultStr;
         return resultStr;
     }
     }

+ 2 - 1
src/main/java/com/uas/platform/b2c/fa/payment/controller/PingAnAccountController.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2c.fa.payment.controller;
 package com.uas.platform.b2c.fa.payment.controller;
 
 
 import com.uas.platform.b2c.fa.payment.service.PingAnAccountService;
 import com.uas.platform.b2c.fa.payment.service.PingAnAccountService;
+import com.uas.platform.b2c.trade.support.ResultMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -29,7 +30,7 @@ public class PingAnAccountController {
      * @return
      * @return
      */
      */
     @RequestMapping(value = "/open", method = RequestMethod.POST)
     @RequestMapping(value = "/open", method = RequestMethod.POST)
-    public String openAccount(Boolean isPersonal) {
+    public ResultMap openAccount(Boolean isPersonal) {
         return pingAnAccountService.openAccount(isPersonal);
         return pingAnAccountService.openAccount(isPersonal);
     }
     }
 
 

+ 2 - 1
src/main/java/com/uas/platform/b2c/fa/payment/service/BankReceiptsService.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2c.fa.payment.service;
 package com.uas.platform.b2c.fa.payment.service;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2c.trade.support.ResultMap;
 
 
 /**
 /**
  * 平安的facade层
  * 平安的facade层
@@ -22,7 +23,7 @@ public interface BankReceiptsService {
      * @param isPersonal 是否是个人
      * @param isPersonal 是否是个人
      * @return String
      * @return String
      */
      */
-    String queryBindCard(Boolean isPersonal);
+    ResultMap queryBindCard(Boolean isPersonal);
 
 
     /**
     /**
      * 银联快捷支付 获取短信验证码的信息
      * 银联快捷支付 获取短信验证码的信息

+ 4 - 2
src/main/java/com/uas/platform/b2c/fa/payment/service/PingAnAccountService.java

@@ -1,5 +1,7 @@
 package com.uas.platform.b2c.fa.payment.service;
 package com.uas.platform.b2c.fa.payment.service;
 
 
+import com.uas.platform.b2c.trade.support.ResultMap;
+
 /**
 /**
  * 平安账户的接口
  * 平安账户的接口
  *
  *
@@ -10,9 +12,9 @@ public interface PingAnAccountService {
     /**
     /**
      * 开户的
      * 开户的
      * @param isPersonal
      * @param isPersonal
-     * @return
+     * @return ResultMap
      */
      */
-    String openAccount(Boolean isPersonal);
+    ResultMap openAccount(Boolean isPersonal);
 
 
 
 
     /**
     /**

+ 5 - 4
src/main/java/com/uas/platform/b2c/fa/payment/service/impl/BankReceiptsServiceImpl.java

@@ -7,6 +7,7 @@ import com.uas.platform.b2c.fa.payment.constant.PingAnRequestUrlPostfix;
 import com.uas.platform.b2c.fa.payment.constant.StringConstant;
 import com.uas.platform.b2c.fa.payment.constant.StringConstant;
 import com.uas.platform.b2c.fa.payment.service.BankReceiptsService;
 import com.uas.platform.b2c.fa.payment.service.BankReceiptsService;
 import com.uas.platform.b2c.fa.payment.support.UserInfoSupport;
 import com.uas.platform.b2c.fa.payment.support.UserInfoSupport;
+import com.uas.platform.b2c.trade.support.ResultMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import org.springframework.util.StringUtils;
@@ -44,8 +45,8 @@ public class BankReceiptsServiceImpl implements BankReceiptsService {
     @Override
     @Override
     public String bindCard(Boolean isPersonal) {
     public String bindCard(Boolean isPersonal) {
         Map<String, String> map = userInfoSupport.getUserInfoMap(isPersonal);
         Map<String, String> map = userInfoSupport.getUserInfoMap(isPersonal);
-        String httpEntity = restTemplate.postForObject(sysConf.getPingAnUrl() + PingAnRequestUrlPostfix.BINDCARD, map, String.class);
-        return httpEntity;
+        ResultMap resultMap = restTemplate.postForObject(sysConf.getPingAnUrl() + PingAnRequestUrlPostfix.BINDCARD, map, ResultMap.class);
+        return resultMap.getMessage();
     }
     }
 
 
     /**
     /**
@@ -55,9 +56,9 @@ public class BankReceiptsServiceImpl implements BankReceiptsService {
      * @return String
      * @return String
      */
      */
     @Override
     @Override
-    public String queryBindCard(Boolean isPersonal) {
+    public ResultMap queryBindCard(Boolean isPersonal) {
         Map<String, String> map = userInfoSupport.getUserInfoMap(isPersonal);
         Map<String, String> map = userInfoSupport.getUserInfoMap(isPersonal);
-        String resultStr = restTemplate.postForObject(sysConf.getPingAnUrl() + PingAnRequestUrlPostfix.QUERYBINDCARD, map, String.class);
+        ResultMap resultStr = restTemplate.postForObject(sysConf.getPingAnUrl() + PingAnRequestUrlPostfix.QUERYBINDCARD, map, ResultMap.class);
         return resultStr;
         return resultStr;
     }
     }
 
 

+ 3 - 2
src/main/java/com/uas/platform/b2c/fa/payment/service/impl/PingAnAccountServiceImpl.java

@@ -6,6 +6,7 @@ import com.uas.platform.b2c.fa.payment.constant.Regex;
 import com.uas.platform.b2c.fa.payment.constant.StringConstant;
 import com.uas.platform.b2c.fa.payment.constant.StringConstant;
 import com.uas.platform.b2c.fa.payment.service.PingAnAccountService;
 import com.uas.platform.b2c.fa.payment.service.PingAnAccountService;
 import com.uas.platform.b2c.fa.payment.support.UserInfoSupport;
 import com.uas.platform.b2c.fa.payment.support.UserInfoSupport;
+import com.uas.platform.b2c.trade.support.ResultMap;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.collections.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -43,9 +44,9 @@ public class PingAnAccountServiceImpl implements PingAnAccountService {
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public String openAccount(Boolean isPersonal) {
+    public ResultMap openAccount(Boolean isPersonal) {
         Map<String, String> userInfoMap = userInfoSupport.getUserInfoMap(isPersonal);
         Map<String, String> userInfoMap = userInfoSupport.getUserInfoMap(isPersonal);
-        String resultStr = restTemplate.postForObject(sysConf.getPingAnUrl() + PingAnRequestUrlPostfix.PINGANOPENACCOUNT, userInfoMap, String.class);
+        ResultMap resultStr = restTemplate.postForObject(sysConf.getPingAnUrl() + PingAnRequestUrlPostfix.PINGANOPENACCOUNT, userInfoMap, ResultMap.class);
         return resultStr;
         return resultStr;
     }
     }