Commit 0337d83f authored by 王向伟's avatar 王向伟

订单状态返回值换为JsonResult

parent f2a3d558
...@@ -39,6 +39,7 @@ import cn.quantgroup.cashloanflowboss.spi.xyqb.service.XYQBCenterService; ...@@ -39,6 +39,7 @@ import cn.quantgroup.cashloanflowboss.spi.xyqb.service.XYQBCenterService;
import cn.quantgroup.cashloanflowboss.utils.JSONTools; import cn.quantgroup.cashloanflowboss.utils.JSONTools;
import cn.quantgroup.user.retbean.XUser; import cn.quantgroup.user.retbean.XUser;
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.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
...@@ -154,7 +155,7 @@ public class MoOrderServiceImpl implements OrderService{ ...@@ -154,7 +155,7 @@ public class MoOrderServiceImpl implements OrderService{
JsonResult<XyqbCurrentOrderStatusServiceResultModel> xyqbCenterServiceXyqbOrderStatus = koalaCenterService.getOrderStatus(it.getApplyNo(), it.getLoanId()); JsonResult<XyqbCurrentOrderStatusServiceResultModel> xyqbCenterServiceXyqbOrderStatus = koalaCenterService.getOrderStatus(it.getApplyNo(), it.getLoanId());
log.info("[xyqbCenterService.getXyqbOrderStatus]xyqbOrderStatus={}", JSONTools.serialize(xyqbCenterServiceXyqbOrderStatus)); log.info("[xyqbCenterService.getXyqbOrderStatus]xyqbOrderStatus={}", JSONTools.serialize(xyqbCenterServiceXyqbOrderStatus));
if (xyqbCenterServiceXyqbOrderStatus.isSuccess()) { if (xyqbCenterServiceXyqbOrderStatus.getSuccess()) {
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);
...@@ -400,7 +401,7 @@ public class MoOrderServiceImpl implements OrderService{ ...@@ -400,7 +401,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.isSuccess()) { if (xyqbOrderHistoryStatusResult.getSuccess()) {
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<>();
...@@ -829,4 +830,17 @@ public class MoOrderServiceImpl implements OrderService{ ...@@ -829,4 +830,17 @@ public class MoOrderServiceImpl implements OrderService{
} }
} }
public static void main(String[] args) {
String result = "{\"msg\":\"success\",\"code\":\"0000\",\"businessCode\":\"0000\",\"data\":{\"historyStatus\":[{\"status\":\"CREDIT_SUCC\",\"updateTime\":1590723480,\"kaNoticeType\":\"CREDIT_SUCC\"},{\"status\":\"FUAD_ASSIFN_SUCC\",\"updateTime\":1590723720,\"kaNoticeType\":\"FUAD_ASSIFN_SUCC\"}]},\"success\":true,\"zero_FILL_TEMPLATE\":null,\"success_BUSINESS_CODE\":null,\"success_STRING_CODE\":null,\"message\":\"success\"}";
TypeReference<JsonResult<XyqbHistoryOrderStatusServiceResultModel>> typeToken = new TypeReference<JsonResult<XyqbHistoryOrderStatusServiceResultModel>>() {
};
JsonResult<XyqbHistoryOrderStatusServiceResultModel> xyqbHistoryOrderStatusServiceResultModelJsonResult = JSONObject.parseObject(result, typeToken);
boolean success = xyqbHistoryOrderStatusServiceResultModelJsonResult.getSuccess();
System.out.println(success);
}
} }
...@@ -103,7 +103,8 @@ public class JsonResult<T> implements Serializable { ...@@ -103,7 +103,8 @@ public class JsonResult<T> implements Serializable {
* @return * @return
*/ */
public boolean isSuccess(){ public boolean isSuccess(){
return SUCCESS_STRING_CODE.equals(this.getCode()) && SUCCESS_BUSINESS_CODE.equals(this.getBusinessCode()); return SUCCESS_STRING_CODE.equals(this.getCode())
&& SUCCESS_BUSINESS_CODE.equals(this.getBusinessCode());
} }
public String getMessage() { public String getMessage() {
......
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