Commit 7cca64c0 authored by 王向伟's avatar 王向伟

Feign 使用String 接收

parent def37ade
...@@ -165,14 +165,12 @@ public class MoOrderServiceImpl implements OrderService{ ...@@ -165,14 +165,12 @@ public class MoOrderServiceImpl implements OrderService{
ServiceResult<XyqbCurrentOrderStatusServiceResultModel>orderStatusResult = xyqbCenterService.getXyqbOrderStatus(it.getApplyNo(),it.getLoanId()); ServiceResult<XyqbCurrentOrderStatusServiceResultModel>orderStatusResult = xyqbCenterService.getXyqbOrderStatus(it.getApplyNo(),it.getLoanId());
if(Objects.nonNull(orderStatusResult) && orderStatusResult.isSuccess()){ if(Objects.nonNull(orderStatusResult) && orderStatusResult.isSuccess()){
xyqbCenterServiceXyqbOrderStatus = JsonResult.buildSuccess("success",orderStatusResult.getData()); xyqbCenterServiceXyqbOrderStatus = JsonResult.buildSuccess("success",orderStatusResult.getData());
xyqbCenterServiceXyqbOrderStatus.setSuccess(true);
}else { }else {
xyqbCenterServiceXyqbOrderStatus = JsonResult.buildError("success",null); xyqbCenterServiceXyqbOrderStatus = JsonResult.buildError("success",null);
xyqbCenterServiceXyqbOrderStatus.setSuccess(false);
} }
} }
log.info("[xyqbCenterService.getXyqbOrderStatus]xyqbOrderStatus={}", JSONTools.serialize(xyqbCenterServiceXyqbOrderStatus)); log.info("[xyqbCenterService.getXyqbOrderStatus]xyqbOrderStatus={}", JSONTools.serialize(xyqbCenterServiceXyqbOrderStatus));
if (xyqbCenterServiceXyqbOrderStatus.getSuccess()) { if (xyqbCenterServiceXyqbOrderStatus.isSuccess()) {
QueryXyqbOrderStatus currentStatus = xyqbCenterServiceXyqbOrderStatus.getData().getCurrentStatus(); QueryXyqbOrderStatus currentStatus = xyqbCenterServiceXyqbOrderStatus.getData().getCurrentStatus();
Tuple<String, List<OrderVo.OptButton>> currentStatusAndButtons = this.getCurrentStatusAndButtons(currentStatus, it); Tuple<String, List<OrderVo.OptButton>> currentStatusAndButtons = this.getCurrentStatusAndButtons(currentStatus, it);
...@@ -418,7 +416,7 @@ public class MoOrderServiceImpl implements OrderService{ ...@@ -418,7 +416,7 @@ public class MoOrderServiceImpl implements OrderService{
} }
JsonResult<XyqbHistoryOrderStatusServiceResultModel> xyqbOrderHistoryStatusResult = koalaCenterService.getOrderHistoryStatus(orderMapping.getApplyNo(), orderMapping.getLoanId()); JsonResult<XyqbHistoryOrderStatusServiceResultModel> xyqbOrderHistoryStatusResult = koalaCenterService.getOrderHistoryStatus(orderMapping.getApplyNo(), orderMapping.getLoanId());
if (xyqbOrderHistoryStatusResult.getSuccess()) { if (xyqbOrderHistoryStatusResult.isSuccess()) {
log.info("[getOrderHistoryStatus]查询成功channelOrderNumber={}, xyqbOrderHistoryStatusResult={}", channelOrderNumber, JSONTools.serialize(xyqbOrderHistoryStatusResult)); log.info("[getOrderHistoryStatus]查询成功channelOrderNumber={}, xyqbOrderHistoryStatusResult={}", channelOrderNumber, JSONTools.serialize(xyqbOrderHistoryStatusResult));
XyqbHistoryOrderStatusServiceResultModel data = xyqbOrderHistoryStatusResult.getData(); XyqbHistoryOrderStatusServiceResultModel data = xyqbOrderHistoryStatusResult.getData();
List<VoOrderStatus> historyStatusList = new ArrayList<>(); List<VoOrderStatus> historyStatusList = new ArrayList<>();
...@@ -859,8 +857,8 @@ public class MoOrderServiceImpl implements OrderService{ ...@@ -859,8 +857,8 @@ public class MoOrderServiceImpl implements OrderService{
TypeReference<JsonResult<XyqbHistoryOrderStatusServiceResultModel>> typeToken = new TypeReference<JsonResult<XyqbHistoryOrderStatusServiceResultModel>>() { TypeReference<JsonResult<XyqbHistoryOrderStatusServiceResultModel>> typeToken = new TypeReference<JsonResult<XyqbHistoryOrderStatusServiceResultModel>>() {
}; };
JsonResult<XyqbHistoryOrderStatusServiceResultModel> xyqbHistoryOrderStatusServiceResultModelJsonResult = JSONObject.parseObject(result, typeToken); JsonResult<XyqbHistoryOrderStatusServiceResultModel> xyqbHistoryOrderStatusServiceResultModelJsonResult = JSONObject.parseObject(result, typeToken);
boolean success = xyqbHistoryOrderStatusServiceResultModelJsonResult.getSuccess();
System.out.println(success);
} }
......
...@@ -82,11 +82,12 @@ public interface KoalaCenter { ...@@ -82,11 +82,12 @@ public interface KoalaCenter {
* @return * @return
*/ */
@PostMapping(value = "/v1/order/query/status", consumes = "application/x-www-form-urlencoded") @PostMapping(value = "/v1/order/query/status", consumes = "application/x-www-form-urlencoded")
JsonResult<XyqbCurrentOrderStatusServiceResultModel> getOrderStatus(@RequestParam Map paramMap); String getOrderStatus(@RequestParam Map paramMap);
//用String不用JsonResult 是因为 字段首个字母大写时 会有问题
@PostMapping(value = "/v1/order/query/status/history", consumes = "application/x-www-form-urlencoded") @PostMapping(value = "/v1/order/query/status/history", consumes = "application/x-www-form-urlencoded")
JsonResult<XyqbHistoryOrderStatusServiceResultModel> getOrderHistoryStatus(@RequestParam Map paramMap); String getOrderHistoryStatus(@RequestParam Map paramMap);
@Component @Component
class Fallback implements KoalaCenter { class Fallback implements KoalaCenter {
...@@ -124,14 +125,13 @@ public interface KoalaCenter { ...@@ -124,14 +125,13 @@ public interface KoalaCenter {
} }
@Override @Override
public JsonResult<XyqbCurrentOrderStatusServiceResultModel> getOrderStatus(Map paramMap) { public String getOrderStatus(Map paramMap) {
JsonResult jsonResult = JsonResult.buildError("查询出错"); JsonResult jsonResult = JsonResult.buildError("查询出错");
jsonResult.setSuccess(false); return jsonResult.toString();
return jsonResult;
} }
@Override @Override
public JsonResult<XyqbHistoryOrderStatusServiceResultModel> getOrderHistoryStatus(Map paramMap) { public String getOrderHistoryStatus(Map paramMap) {
return null; return null;
} }
} }
......
...@@ -11,6 +11,7 @@ import cn.quantgroup.cashloanflowboss.spi.model.JsonResult; ...@@ -11,6 +11,7 @@ import cn.quantgroup.cashloanflowboss.spi.model.JsonResult;
import cn.quantgroup.cashloanflowboss.spi.xyqb.util.SignUtil; import cn.quantgroup.cashloanflowboss.spi.xyqb.util.SignUtil;
import cn.quantgroup.cashloanflowboss.utils.JSONTools; import cn.quantgroup.cashloanflowboss.utils.JSONTools;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -146,11 +147,12 @@ public class KoalaCenterService { ...@@ -146,11 +147,12 @@ public class KoalaCenterService {
paramMap = SignUtil.sign(SignUtil.KA_API_KEY, paramMap); paramMap = SignUtil.sign(SignUtil.KA_API_KEY, paramMap);
JsonResult<XyqbCurrentOrderStatusServiceResultModel> orderStatus; JsonResult<XyqbCurrentOrderStatusServiceResultModel> orderStatus;
try { try {
orderStatus = koalaCenter.getOrderStatus(paramMap); String result = koalaCenter.getOrderStatus(paramMap);
TypeReference<JsonResult<XyqbCurrentOrderStatusServiceResultModel>> type = new TypeReference<JsonResult<XyqbCurrentOrderStatusServiceResultModel>>(){};
orderStatus = JSONObject.parseObject(result,type);
} catch (Exception e) { } catch (Exception e) {
log.error("获取状态出错",e); log.error("获取状态出错",e);
orderStatus = JsonResult.buildError("远程错误"); orderStatus = JsonResult.buildError("远程错误");
orderStatus.setSuccess(false);
} }
log.info("[getOrderStatus]koala订单状态查询,creditOrderNumber={},result={}", creditOrderNumber, JSONTools.serialize(orderStatus)); log.info("[getOrderStatus]koala订单状态查询,creditOrderNumber={},result={}", creditOrderNumber, JSONTools.serialize(orderStatus));
return orderStatus; return orderStatus;
...@@ -166,11 +168,12 @@ public class KoalaCenterService { ...@@ -166,11 +168,12 @@ public class KoalaCenterService {
paramMap = SignUtil.sign(SignUtil.KA_API_KEY, paramMap); paramMap = SignUtil.sign(SignUtil.KA_API_KEY, paramMap);
JsonResult<XyqbHistoryOrderStatusServiceResultModel> orderHistoryStatus = null; JsonResult<XyqbHistoryOrderStatusServiceResultModel> orderHistoryStatus = null;
try { try {
orderHistoryStatus = koalaCenter.getOrderHistoryStatus(paramMap); String result = koalaCenter.getOrderHistoryStatus(paramMap);
TypeReference<JsonResult<XyqbHistoryOrderStatusServiceResultModel>> typeReference = new TypeReference<JsonResult<XyqbHistoryOrderStatusServiceResultModel>>(){};
orderHistoryStatus = JSONObject.parseObject(result,typeReference);
} catch (Exception e) { } catch (Exception e) {
log.error("远程错误",e); log.error("远程错误",e);
orderHistoryStatus = JsonResult.buildError("远程错误"); orderHistoryStatus = JsonResult.buildError("远程错误");
orderHistoryStatus.setSuccess(false);
} }
return orderHistoryStatus; return orderHistoryStatus;
......
...@@ -33,7 +33,7 @@ public class JsonResult<T> implements Serializable { ...@@ -33,7 +33,7 @@ public class JsonResult<T> implements Serializable {
private T data = null; private T data = null;
private Boolean success;
public JsonResult(String msg, Long code, T data) { public JsonResult(String msg, Long code, T data) {
...@@ -49,13 +49,7 @@ public class JsonResult<T> implements Serializable { ...@@ -49,13 +49,7 @@ public class JsonResult<T> implements Serializable {
this.businessCode = String.format(ZERO_FILL_TEMPLATE, businessCode); this.businessCode = String.format(ZERO_FILL_TEMPLATE, businessCode);
} }
public JsonResult(String msg, Long code, T data, Long businessCode,Boolean success) {
this.msg = msg;
this.code = String.format(ZERO_FILL_TEMPLATE, code);
this.data = data;
this.businessCode = String.format(ZERO_FILL_TEMPLATE, businessCode);
this.success = success;
}
/** /**
* 构造成功的JsonResult * 构造成功的JsonResult
...@@ -120,6 +114,6 @@ public class JsonResult<T> implements Serializable { ...@@ -120,6 +114,6 @@ public class JsonResult<T> implements Serializable {
String result = "{\"msg\":\"远程服务错误(403,参数错误申请单已到终态)\",\"code\":\"0800\",\"businessCode\":\"0800\",\"success\":false}"; String result = "{\"msg\":\"远程服务错误(403,参数错误申请单已到终态)\",\"code\":\"0800\",\"businessCode\":\"0800\",\"success\":false}";
JsonResult jsonObject = JSONObject.parseObject(result, JsonResult.class); JsonResult jsonObject = JSONObject.parseObject(result, JsonResult.class);
Boolean success = jsonObject.getSuccess();
} }
} }
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