Commit 0c02bcc4 by vega

Merge branch 'fix/1.9.37-支付补偿通知transId为空报错' into qa

parents 571ed3f3 37cac631
package com.freemud.application.sdk.api.ordercenter.service; package com.freemud.application.sdk.api.ordercenter.service;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.freemud.application.sdk.api.base.BaseRequest; import com.freemud.application.sdk.api.base.BaseRequest;
import com.freemud.application.sdk.api.ordercenter.config.OrderCenterProperties; import com.freemud.application.sdk.api.ordercenter.config.OrderCenterProperties;
import com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddressConstant; import com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddressConstant;
...@@ -29,9 +30,10 @@ import org.springframework.core.ParameterizedTypeReference; ...@@ -29,9 +30,10 @@ import org.springframework.core.ParameterizedTypeReference;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import java.util.Collections; import java.lang.reflect.InvocationTargetException;
import java.util.List; import java.util.*;
import java.util.Objects; import java.util.stream.Collector;
import java.util.stream.Collectors;
import static com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddressConstant.*; import static com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddressConstant.*;
...@@ -618,8 +620,8 @@ public class OrderSdkService { ...@@ -618,8 +620,8 @@ public class OrderSdkService {
resp = null; resp = null;
} else { } else {
List<OrderInfoReqs> result; List<OrderInfoReqs> result;
if (Objects.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, responseDTO.getCode())) { if (Objects.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, responseDTO.getCode()) && responseDTO.getResult() instanceof List) {
result = JSON.parseArray(Objects.toString(responseDTO.getResult(), "[]"), OrderInfoReqs.class); result = JSONArray.parseArray(JSON.toJSONString(responseDTO.getResult()), OrderInfoReqs.class);
} else { } else {
result = Collections.emptyList(); result = Collections.emptyList();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment