订单状态查询

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

@@ -8,6 +8,7 @@ import cn.quantgroup.cashloanflowboss.api.order.model.*;
 import cn.quantgroup.cashloanflowboss.api.order.repository.OrderApproveRepository;
 import cn.quantgroup.cashloanflowboss.api.order.util.OrderUtil;
 import cn.quantgroup.cashloanflowboss.core.Application;
+import cn.quantgroup.cashloanflowboss.core.base.Result;
 import cn.quantgroup.cashloanflowboss.core.base.Tuple;
 import cn.quantgroup.cashloanflowboss.spi.clf.entity.ClfOrderMapping;
 import cn.quantgroup.cashloanflowboss.spi.clf.repository.ClfOrderMappingRepository;
@@ -99,9 +100,10 @@ public class OrderService {
 
             OrderApprove orderApprove = orderApproveRepository.findByCreditNumber(it.getApplyNo());
 
-            XyqbCurrentOrderStatusServiceResultModel xyqbOrderStatus = xyqbCenterService.getXyqbOrderStatus(it.getApplyNo(), it.getLoanId());
-            if (xyqbOrderStatus != null) {
-                QueryXyqbOrderStatus currentStatus = xyqbOrderStatus.getCurrentStatus();
+            Result<XyqbCurrentOrderStatusServiceResultModel> xyqbCenterServiceXyqbOrderStatus = xyqbCenterService.getXyqbOrderStatus(it.getApplyNo(), it.getLoanId());
+            log.info("[xyqbCenterService.getXyqbOrderStatus]xyqbOrderStatus={}", JSONTools.serialize(xyqbCenterServiceXyqbOrderStatus));
+            if (xyqbCenterServiceXyqbOrderStatus.isSuccess()) {
+                QueryXyqbOrderStatus currentStatus = xyqbCenterServiceXyqbOrderStatus.getData().getCurrentStatus();
 
                 Tuple<String, List<OrderVo.OptButton>> currentStatusAndButtons = OrderUtil.getCurrentStatusAndButtons(currentStatus, orderApprove);
                 orderVo.setStatus(currentStatusAndButtons.getKey());

src/main/java/cn/quantgroup/cashloanflowboss/core/base/Result.java

@@ -3,6 +3,7 @@ package cn.quantgroup.cashloanflowboss.core.base;
 import cn.quantgroup.cashloanflowboss.core.dictionary.ApplicationStatus;
 import cn.quantgroup.cashloanflowboss.core.dictionary.Status;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Objects;
 
@@ -17,7 +18,7 @@ public class Result<T> {
     /**
      * 状态码
      */
-    private int code;
+    private Integer code;
 
     /**
      * 描述信息
@@ -86,4 +87,8 @@ public class Result<T> {
     }
 
 
+    public Boolean isSuccess(){
+        return Objects.nonNull(this.code) && this.code == 0;
+    }
+
 }

src/main/java/cn/quantgroup/cashloanflowboss/core/configuration/FeignClientConfiguration.java

+package cn.quantgroup.cashloanflowboss.core.configuration;
+
+import feign.Logger;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * FeignClient配置
+ * <p>
+ * Created by WeiWei on 2018/11/12.
+ */
+@Configuration
+public class FeignClientConfiguration {
+
+    @Bean
+    Logger.Level feignLoggerLevel() {
+        return Logger.Level.FULL;
+    }
+
+}

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/client/XYQBCenter.java

@@ -2,6 +2,7 @@ package cn.quantgroup.cashloanflowboss.spi.xyqb.client;
 
 import cn.quantgroup.cashloanflowboss.api.order.model.XyqbCurrentOrderStatusServiceResultModel;
 import cn.quantgroup.cashloanflowboss.api.order.model.XyqbHistoryOrderStatusServiceResultModel;
+import cn.quantgroup.cashloanflowboss.core.base.Result;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -21,10 +22,10 @@ public interface XYQBCenter {
     String pushLendingResult(@RequestParam Map parameter);
 
     @PostMapping(value = "/ex/ka/order/status", consumes = "application/x-www-form-urlencoded")
-    XyqbCurrentOrderStatusServiceResultModel getOrderStatus(@RequestParam Map orderNo);
+    Result<XyqbCurrentOrderStatusServiceResultModel> getOrderStatus(@RequestParam Map orderNo);
 
     @PostMapping(value = "/ex/ka/order/status/history", consumes = "application/x-www-form-urlencoded")
-    XyqbHistoryOrderStatusServiceResultModel getXyqbOrderHistoryStatus(Map paramMap);
+    Result<XyqbHistoryOrderStatusServiceResultModel> getXyqbOrderHistoryStatus(Map paramMap);
 
     @Component
     class Fallback implements XYQBCenter {
@@ -35,15 +36,16 @@ public interface XYQBCenter {
         }
 
         @Override
-        public XyqbCurrentOrderStatusServiceResultModel getOrderStatus(Map orderNo) {
+        public Result<XyqbCurrentOrderStatusServiceResultModel> getOrderStatus(Map orderNo) {
             return null;
         }
 
         @Override
-        public XyqbHistoryOrderStatusServiceResultModel getXyqbOrderHistoryStatus(Map paramMap) {
+        public Result<XyqbHistoryOrderStatusServiceResultModel> getXyqbOrderHistoryStatus(Map paramMap) {
             return null;
         }
 
+
     }
 
 }

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/service/XYQBCenterService.java

@@ -2,6 +2,7 @@ package cn.quantgroup.cashloanflowboss.spi.xyqb.service;
 
 import cn.quantgroup.cashloanflowboss.api.order.model.XyqbCurrentOrderStatusServiceResultModel;
 import cn.quantgroup.cashloanflowboss.api.order.model.XyqbHistoryOrderStatusServiceResultModel;
+import cn.quantgroup.cashloanflowboss.core.base.Result;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.client.XYQBCenter;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.repository.ContractRepository;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.repository.FundLendingRepository;
@@ -88,12 +89,14 @@ public class XYQBCenterService {
      * @param loanId
      * @return
      */
-    public XyqbCurrentOrderStatusServiceResultModel getXyqbOrderStatus(String creditOrderNumber, Long loanId) {
+    public Result<XyqbCurrentOrderStatusServiceResultModel> getXyqbOrderStatus(String creditOrderNumber, Long loanId) {
 
         Map paramMap = Maps.newHashMap();
-        paramMap = SignUtil.sign(SignUtil.KA_API_KEY, paramMap);
         paramMap.put("orderNo", creditOrderNumber);
-        paramMap.put("loanId", loanId);
+        if (loanId != null) {
+            paramMap.put("loanId", loanId);
+        }
+        paramMap = SignUtil.sign(SignUtil.KA_API_KEY, paramMap);
 
         return xyqbCenter.getOrderStatus(paramMap);
     }
@@ -104,12 +107,14 @@ public class XYQBCenterService {
      * @param loanId
      * @return
      */
-    public XyqbHistoryOrderStatusServiceResultModel getXyqbOrderHistoryStatus(String creditOrderNumber, Long loanId) {
+    public Result<XyqbHistoryOrderStatusServiceResultModel> getXyqbOrderHistoryStatus(String creditOrderNumber, Long loanId) {
 
         Map paramMap = Maps.newHashMap();
-        paramMap = SignUtil.sign(SignUtil.KA_API_KEY, paramMap);
         paramMap.put("orderNo", creditOrderNumber);
-        paramMap.put("loanId", loanId);
+        if (loanId != null) {
+            paramMap.put("loanId", loanId);
+        }
+        paramMap = SignUtil.sign(SignUtil.KA_API_KEY, paramMap);
 
         return xyqbCenter.getXyqbOrderHistoryStatus(paramMap);
     }