携程支付支付API更新，后台查询携程支付状态更改

fun-common-core/src/main/java/com/ctrip/fun/common/core/util/CtripPayCore.java

@@ -32,7 +32,7 @@ public class CtripPayCore {
 
         for (String key : sArray.keySet()) {
             String value = sArray.get(key);
-            if (value == null || value.equals("") || key.equalsIgnoreCase("sign") || key.equalsIgnoreCase("security_type")) {
+            if (value == null || (value.equals("")&&!"pay_type".equals(key)) || key.equalsIgnoreCase("sign") || key.equalsIgnoreCase("security_type")) {
                 continue;
             }
             result.put(key, value);
@@ -57,7 +57,7 @@ public class CtripPayCore {
         for (int i = 0; i < keys.size(); i++) {
             String key = keys.get(i);
             Object value = params.get(key);
-            if (!("language".equals(key)||"pay_type".equals(key)||"pay_amount".equals(key)||"pay_expire".equals(key)||"amount".equals(key))&&!"head".equals(key)) {
+            if (!("language".equals(key)||"pay_amount".equals(key)||"pay_expire".equals(key)||"amount".equals(key))&&!"head".equals(key)) {
                     value = "\"" + value + "\"";
             }else {
                 if("pay_amount".equals(key)||"amount".equals(key)){

fun-common-core/src/main/java/com/ctrip/fun/common/core/util/JsonUtil.java

@@ -6,8 +6,8 @@ import java.util.Map;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -23,6 +23,27 @@ public class JsonUtil {
     private static final Logger logger = LoggerFactory.getLogger(JsonUtil.class);
 
     /**
+     * 反序列化,忽略空值
+     *
+     * @param content
+     * @param valueType
+     * @param <T>
+     * @return
+     */
+    public static <T> T readValueIgnore(String content, Class<T> valueType) {
+        ObjectMapper mapper = new ObjectMapper();
+        T map;
+        try {
+            map = mapper.readValue(content, valueType);
+        } catch (IOException e) {
+            logger.error("JsonUtil.readValue exception", e);
+            map = null;
+        }
+        return map;
+    }
+    
+    
+    /**
      * 反序列化
      *
      * @param content
@@ -41,6 +62,28 @@ public class JsonUtil {
         }
         return map;
     }
+    
+    
+    /**
+     * 反序列化,忽略未知属性
+     *
+     * @param content
+     * @param valueType
+     * @param <T>
+     * @return
+     */
+    public static <T> T readValueIgnoreUnknownProperties(String content, Class<T> valueType) {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        T map;
+        try {
+            map = mapper.readValue(content, valueType);
+        } catch (IOException e) {
+            logger.error("JsonUtil.readValue exception", e);
+            map = null;
+        }
+        return map;
+    }
 
     /**
      * 反序列化复杂类型

fun-common-soa/src/main/resources/debug/app.properties

@@ -21,7 +21,7 @@ weather.sign=sign=b59bc3ef6191eb9f747dd4e83c99f2a4&format=json
 weather.imagePath=http://7x2w1g.com1.z0.glb.clouddn.com/
 
 #payment3
-payment.queryPayStatusPath=https://payapi.ctrip.com/api-webapp/json/queryPayStatus
+payment.queryPayStatusPath=https://payapi.ctrip.com/api-merchant/json/QueryPayStatusV3                        
 payment.createPayOrderPath=https://payapi.ctrip.com/api-merchant/json/CreatePayOrderV3
 payment.payOrderOperatePath=https://payapi.ctrip.com/api-merchant/json/PayOperationV3
 

fun-common-soa/src/main/resources/development/app.properties

@@ -22,7 +22,7 @@ weather.imagePath=http://7x2w1g.com1.z0.glb.clouddn.com/
 
 #payment3
 
-payment.queryPayStatusPath=https://payapi.ctrip.com/api-webapp/json/queryPayStatus
+payment.queryPayStatusPath=https://payapi.ctrip.com/api-merchant/json/QueryPayStatusV3
 payment.createPayOrderPath=https://payapi.ctrip.com/api-merchant/json/CreatePayOrderV3
 payment.payOrderOperatePath=https://payapi.ctrip.com/api-merchant/json/PayOperationV3
 

fun-common-soa/src/main/resources/production/app.properties

@@ -23,7 +23,7 @@ weather.imagePath=http://img.iwanoutdoor.com/
 #payment2
 #payment.createPayOrderPath=https://payapi.ctrip.com/api-webapp/json/CreatePayOrder
 #payment.payOrderOperatePath=https://payapi.ctrip.com/api-webapp/json/payoperation
-payment.queryPayStatusPath=https://payapi.ctrip.com/api-webapp/json/queryPayStatus
+payment.queryPayStatusPath=https://payapi.ctrip.com/api-merchant/json/QueryPayStatusV3
 
 payment.createPayOrderPath=https://payapi.ctrip.com/api-merchant/json/CreatePayOrderV3
 payment.payOrderOperatePath=https://payapi.ctrip.com/api-merchant/json/PayOperationV3

fun-common-soa/src/main/resources/test/app.properties

@@ -21,7 +21,7 @@ weather.sign=sign=b59bc3ef6191eb9f747dd4e83c99f2a4&format=json
 weather.imagePath=http://7x2w1g.com1.z0.glb.clouddn.com/
 
 #payment2
-payment.queryPayStatusPath=https://payapi.ctrip.com/api-webapp/json/queryPayStatus
+payment.queryPayStatusPath=https://payapi.ctrip.com/api-merchant/json/QueryPayStatusV3
 payment.createPayOrderPath=https://payapi.ctrip.com/api-merchant/json/CreatePayOrderV3
 payment.payOrderOperatePath=https://payapi.ctrip.com/api-merchant/json/PayOperationV3
 

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/payment/QueryPayStatusResponseBean.java

@@ -124,4 +124,28 @@ public class QueryPayStatusResponseBean extends AbstractPaymentBean{
 		this.resultMessage = resultMessage;
 	}
 
+	public String getMerchantName() {
+		return merchantName;
+	}
+
+	public void setMerchantName(String merchantName) {
+		this.merchantName = merchantName;
+	}
+
+	public String getPayType() {
+		return payType;
+	}
+
+	public void setPayType(String payType) {
+		this.payType = payType;
+	}
+
+	public BigDecimal getAmount() {
+		return amount;
+	}
+
+	public void setAmount(BigDecimal amount) {
+		this.amount = amount;
+	}
+
 }