订单状态返回值换为JsonResult

src/main/java/cn/quantgroup/cashloanflowboss/api/order/service/MoOrderServiceImpl.java

@@ -24,10 +24,10 @@ import cn.quantgroup.cashloanflowboss.spi.clf.model.KANoticeType;
 import cn.quantgroup.cashloanflowboss.spi.clf.model.LoanProgress;
 import cn.quantgroup.cashloanflowboss.spi.clf.repository.ClfOrderMappingRepository;
 import cn.quantgroup.cashloanflowboss.spi.clf.service.CLFCenterService;
-import cn.quantgroup.cashloanflowboss.spi.clotho.service.ClothoCenterService;
 import cn.quantgroup.cashloanflowboss.spi.jolyne.JolyneService;
 import cn.quantgroup.cashloanflowboss.spi.koala.service.KoalaCenterService;
 import cn.quantgroup.cashloanflowboss.spi.mo_clotho.service.MoClothoService;
+import cn.quantgroup.cashloanflowboss.spi.model.JsonResult;
 import cn.quantgroup.cashloanflowboss.spi.opapi.OPCenter;
 import cn.quantgroup.cashloanflowboss.spi.user.service.XyqbUserService;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.Contract;
@@ -152,7 +152,7 @@ public class MoOrderServiceImpl implements OrderService{
             orderVo.setCreatedAt(it.getCreatedAt());
             if (StringUtils.isNotEmpty(it.getApplyNo())) {
 
-                ServiceResult<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));
                 if (xyqbCenterServiceXyqbOrderStatus.isSuccess()) {
                     QueryXyqbOrderStatus currentStatus = xyqbCenterServiceXyqbOrderStatus.getData().getCurrentStatus();
@@ -399,7 +399,7 @@ public class MoOrderServiceImpl implements OrderService{
             return historyOrderStatusVoModel;
         }
 
-        ServiceResult<XyqbHistoryOrderStatusServiceResultModel> xyqbOrderHistoryStatusResult = koalaCenterService.getXyqbOrderHistoryStatus(orderMapping.getApplyNo(), orderMapping.getLoanId());
+        JsonResult<XyqbHistoryOrderStatusServiceResultModel> xyqbOrderHistoryStatusResult = koalaCenterService.getOrderHistoryStatus(orderMapping.getApplyNo(), orderMapping.getLoanId());
         if (xyqbOrderHistoryStatusResult.isSuccess()) {
             log.info("[getOrderHistoryStatus]查询成功channelOrderNumber={}, xyqbOrderHistoryStatusResult={}", channelOrderNumber, JSONTools.serialize(xyqbOrderHistoryStatusResult));
             XyqbHistoryOrderStatusServiceResultModel data = xyqbOrderHistoryStatusResult.getData();

src/main/java/cn/quantgroup/cashloanflowboss/spi/koala/client/KoalaCenter.java

@@ -5,6 +5,7 @@ import cn.quantgroup.cashloanflowboss.api.order.model.XyqbHistoryOrderStatusServ
 import cn.quantgroup.cashloanflowboss.conf.FeignConfig;
 import cn.quantgroup.cashloanflowboss.core.base.ServiceResult;
 import cn.quantgroup.cashloanflowboss.spi.clotho.exception.ClothoCenterException;
+import cn.quantgroup.cashloanflowboss.spi.model.JsonResult;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -81,11 +82,11 @@ public interface KoalaCenter {
      * @return
      */
     @PostMapping(value = "/v1/order/query/status", consumes = "application/x-www-form-urlencoded")
-    ServiceResult<XyqbCurrentOrderStatusServiceResultModel> getOrderStatus(@RequestParam Map paramMap);
+    JsonResult<XyqbCurrentOrderStatusServiceResultModel> getOrderStatus(@RequestParam Map paramMap);
 
 
     @PostMapping(value = "/v1/order/query/status/history", consumes = "application/x-www-form-urlencoded")
-    ServiceResult<XyqbHistoryOrderStatusServiceResultModel> getOrderHistoryStatus(@RequestParam Map paramMap);
+    JsonResult<XyqbHistoryOrderStatusServiceResultModel> getOrderHistoryStatus(@RequestParam Map paramMap);
 
     @Component
     class Fallback implements KoalaCenter {
@@ -123,12 +124,12 @@ public interface KoalaCenter {
         }
 
         @Override
-        public ServiceResult<XyqbCurrentOrderStatusServiceResultModel> getOrderStatus(Map paramMap) {
+        public JsonResult<XyqbCurrentOrderStatusServiceResultModel> getOrderStatus(Map paramMap) {
             return null;
         }
 
         @Override
-        public ServiceResult<XyqbHistoryOrderStatusServiceResultModel> getOrderHistoryStatus(Map paramMap) {
+        public JsonResult<XyqbHistoryOrderStatusServiceResultModel> getOrderHistoryStatus(Map paramMap) {
             return null;
         }
     }

src/main/java/cn/quantgroup/cashloanflowboss/spi/koala/service/KoalaCenterService.java

@@ -137,20 +137,20 @@ public class KoalaCenterService {
     }
 
 
-    public ServiceResult<XyqbCurrentOrderStatusServiceResultModel> getOrderStatus(String creditOrderNumber, Long loanId){
+    public JsonResult<XyqbCurrentOrderStatusServiceResultModel> getOrderStatus(String creditOrderNumber, Long loanId){
         Map paramMap = Maps.newHashMap();
         paramMap.put("orderNo", creditOrderNumber);
         if (loanId != null && loanId > 1) {
             paramMap.put("loanId", loanId);
         }
 
-        final ServiceResult<XyqbCurrentOrderStatusServiceResultModel> orderStatus = koalaCenter.getOrderStatus(paramMap);
+        final JsonResult<XyqbCurrentOrderStatusServiceResultModel> orderStatus = koalaCenter.getOrderStatus(paramMap);
         log.info("[getOrderStatus]koala订单状态查询,creditOrderNumber={},result={}", creditOrderNumber, JSONTools.serialize(orderStatus));
         return orderStatus;
     }
 
 
-    public ServiceResult<XyqbHistoryOrderStatusServiceResultModel> getXyqbOrderHistoryStatus(String creditOrderNumber, Long loanId){
+    public JsonResult<XyqbHistoryOrderStatusServiceResultModel> getOrderHistoryStatus(String creditOrderNumber, Long loanId){
         Map paramMap = Maps.newHashMap();
         paramMap.put("orderNo", creditOrderNumber);
         if (loanId != null) {