From d1fbe63220410d830be3f10c2c1f4433d5335385 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E5=B0=B9=E5=BB=BA=E5=8D=8E?= <yinjianhua@credithundred.com>
Date: Fri, 29 Jul 2016 13:59:34 +0800
Subject: [PATCH] .

---
 .../com/baibao/loan/service/impl/RepaymentManagerImpl.java  |  1 -
 .../com/baibao/pay/service/impl/PayLoggerServiceImpl.java   |  1 -
 pay/fuyou-utils/src/main/resources/system.properties        |  8 ++++----
 .../main/java/com/baibao/pay/fuyou/FuyouPayServiceImpl.java | 13 +++++++++----
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/loan/loan/src/main/java/com/baibao/loan/service/impl/RepaymentManagerImpl.java b/loan/loan/src/main/java/com/baibao/loan/service/impl/RepaymentManagerImpl.java
index 7313a33..cff17bf 100644
--- a/loan/loan/src/main/java/com/baibao/loan/service/impl/RepaymentManagerImpl.java
+++ b/loan/loan/src/main/java/com/baibao/loan/service/impl/RepaymentManagerImpl.java
@@ -41,7 +41,6 @@ public class RepaymentManagerImpl
 	@Override
 	public ArrayList<Repayment> findOverdueRepayment(Integer[] status)
 	{
-		// TODO Auto-generated method stub
 		return null;
 	}
 }
diff --git a/pay/fuyou-utils/src/main/java/com/baibao/pay/service/impl/PayLoggerServiceImpl.java b/pay/fuyou-utils/src/main/java/com/baibao/pay/service/impl/PayLoggerServiceImpl.java
index 5cb3952..c348af5 100644
--- a/pay/fuyou-utils/src/main/java/com/baibao/pay/service/impl/PayLoggerServiceImpl.java
+++ b/pay/fuyou-utils/src/main/java/com/baibao/pay/service/impl/PayLoggerServiceImpl.java
@@ -44,7 +44,6 @@ public class PayLoggerServiceImpl
 	public void logback(
 		Timestamp timestamp, String tradeNo, String response, BussStatus status)
 	{
-		// TODO Auto-generated method stub
 
 	}
 }
diff --git a/pay/fuyou-utils/src/main/resources/system.properties b/pay/fuyou-utils/src/main/resources/system.properties
index af9ac17..eb4b502 100755
--- a/pay/fuyou-utils/src/main/resources/system.properties
+++ b/pay/fuyou-utils/src/main/resources/system.properties
@@ -27,12 +27,12 @@ redis-password=
 fuyou-url=http://www-1.fuiou.com:9057
 fuyou-privateKeyPath=/opt/baibao/key/prkey.key
 fuyou-publicKeyPath=/opt/baibao/key/pbkey.key
-#fuyou-merchantid=0002900F0041077
-#fuyou-company-account=jzh09
+fuyou-merchantid=0002900F0041077
+fuyou-company-account=jzh09
 fuyou-receivable-account=19901010788
 
-fuyou-merchantid=0002900F0041080
-fuyou-company-account=jzh07
+#fuyou-merchantid=0002900F0041080
+#fuyou-company-account=jzh07
 
 callback-url=https://test.baibaojinfu.com/service/fuiou
 
diff --git a/pay/pay-fuyou/src/main/java/com/baibao/pay/fuyou/FuyouPayServiceImpl.java b/pay/pay-fuyou/src/main/java/com/baibao/pay/fuyou/FuyouPayServiceImpl.java
index 69891f7..c4d2203 100644
--- a/pay/pay-fuyou/src/main/java/com/baibao/pay/fuyou/FuyouPayServiceImpl.java
+++ b/pay/pay-fuyou/src/main/java/com/baibao/pay/fuyou/FuyouPayServiceImpl.java
@@ -1361,10 +1361,15 @@ public class FuyouPayServiceImpl
 
 		if (request.getMethod() == RedirectRequest.Method.modifyCard)
 		{
-			response.setTargetUrl(
-				String.format("%s/jzh/%schangeCard2.action", fuyouUrl,
-					(request.getReason() == RedirectRequest.Reason.app)?
-						"app/": ""));
+			if (request.getReason() == RedirectRequest.Reason.app)
+			{
+				response.setTargetUrl(
+					String.format("%s/jzh/app/appChangeCard.action", fuyouUrl);
+			} else
+			{
+				response.setTargetUrl(
+					String.format("%s/jzh/changeCard2.action", fuyouUrl));
+			}
 		} else
 		if (request.getMethod() == RedirectRequest.Method.modifyPhone)
 		{
-- 
2.11.4.GIT