订单历史状态查询

src/main/java/cn/quantgroup/cashloanflowboss/api/order/model/HistoryOrderStatusVoModel.java

+package cn.quantgroup.cashloanflowboss.api.order.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * function:
+ * date: 2019/8/15
+ *
+ * @author: suntao
+ */
+
+@Data
+public class HistoryOrderStatusVoModel {
+    private List<VoOrderStatus> historyStatus;
+}

src/main/java/cn/quantgroup/cashloanflowboss/api/order/model/OrderVo.java

@@ -2,6 +2,7 @@ package cn.quantgroup.cashloanflowboss.api.order.model;
 
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -16,7 +17,7 @@ public class OrderVo {
     private Long id;
     private Long channelId;
     private String channelOrderNumber;
-    private Long createdAt;
+    private Date createdAt;
     private String status;
     /**
      * [ {action:"audit",name:"审核"},{},{}...  ]

src/main/java/cn/quantgroup/cashloanflowboss/api/order/model/VoOrderStatus.java

+package cn.quantgroup.cashloanflowboss.api.order.model;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * function:
+ * date: 2019/8/16
+ *
+ * @author: suntao
+ */
+@Data
+public class VoOrderStatus {
+    private String status;
+    private Date updateTime;
+}

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

@@ -24,6 +24,7 @@ import cn.quantgroup.cashloanflowboss.utils.JSONTools;
 import cn.quantgroup.user.retbean.XUser;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -35,6 +36,7 @@ import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentMap;
 import javax.persistence.criteria.Predicate;
+
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -110,7 +112,7 @@ public class OrderService {
             orderVo.setId(it.getId());
             orderVo.setChannelId(it.getRegisteredFrom());
             orderVo.setChannelOrderNumber(it.getChannelOrderNo());
-            orderVo.setCreatedAt(it.getCreatedAt().getTime());
+            orderVo.setCreatedAt(it.getCreatedAt());
             if (StringUtils.isNotEmpty(it.getApplyNo())) {
 
                 OrderApprove orderApprove = orderApproveRepository.findByCreditNumber(it.getApplyNo());
@@ -268,28 +270,41 @@ public class OrderService {
         return "success".equals(cancel_result);
     }
 
-  public XyqbHistoryOrderStatusServiceResultModel getOrderHistoryStatus(String channelOrderNumber) {
-    ClfOrderMapping orderMapping = clfOrderMappingRepository.findByChannelOrderNoLastOne(channelOrderNumber);
-    if (orderMapping == null) {
-      return new XyqbHistoryOrderStatusServiceResultModel();
-    }
-    ServiceResult<XyqbHistoryOrderStatusServiceResultModel> xyqbOrderHistoryStatusResult = xyqbCenterService.getXyqbOrderHistoryStatus(orderMapping.getApplyNo(), orderMapping.getLoanId());
-    if (xyqbOrderHistoryStatusResult.isSuccess()) {
-      log.info("[getOrderHistoryStatus]查询成功channelOrderNumber={}, xyqbOrderHistoryStatusResult={}", channelOrderNumber, JSONTools.serialize(xyqbOrderHistoryStatusResult));
-      return xyqbOrderHistoryStatusResult.getData();
-    } else {
-      log.info("[getOrderHistoryStatus]查询失败channelOrderNumber={}, xyqbOrderHistoryStatusResult={}", channelOrderNumber, JSONTools.serialize(xyqbOrderHistoryStatusResult));
-      return new XyqbHistoryOrderStatusServiceResultModel();
+    public HistoryOrderStatusVoModel getOrderHistoryStatus(String channelOrderNumber) {
+        ClfOrderMapping orderMapping = clfOrderMappingRepository.findByChannelOrderNoLastOne(channelOrderNumber);
+        HistoryOrderStatusVoModel historyOrderStatusVoModel = new HistoryOrderStatusVoModel();
+        if (orderMapping == null) {
+            return historyOrderStatusVoModel;
+        }
+        OrderApprove orderApprove = orderApproveRepository.findByCreditNumber(orderMapping.getApplyNo());
+
+        ServiceResult<XyqbHistoryOrderStatusServiceResultModel> xyqbOrderHistoryStatusResult = xyqbCenterService.getXyqbOrderHistoryStatus(orderMapping.getApplyNo(), orderMapping.getLoanId());
+        if (xyqbOrderHistoryStatusResult.isSuccess()) {
+            log.info("[getOrderHistoryStatus]查询成功channelOrderNumber={}, xyqbOrderHistoryStatusResult={}", channelOrderNumber, JSONTools.serialize(xyqbOrderHistoryStatusResult));
+            XyqbHistoryOrderStatusServiceResultModel data = xyqbOrderHistoryStatusResult.getData();
+            List<VoOrderStatus> historyStatusList = new ArrayList<>();
+            for (QueryXyqbOrderStatus queryXyqbOrderStatus : data.getHistoryStatus()) {
+                VoOrderStatus voOrderStatus = new VoOrderStatus();
+                Tuple<String, List<OrderVo.OptButton>> oneStatus = OrderUtil.getCurrentStatusAndButtons(queryXyqbOrderStatus, orderApprove);
+                voOrderStatus.setStatus(oneStatus.getKey());
+                voOrderStatus.setUpdateTime(new Date(queryXyqbOrderStatus.getUpdateTime()));
+                historyStatusList.add(voOrderStatus);
+            }
+            historyOrderStatusVoModel.setHistoryStatus(historyStatusList);
+            return historyOrderStatusVoModel;
+        } else {
+            log.info("[getOrderHistoryStatus]查询失败channelOrderNumber={}, xyqbOrderHistoryStatusResult={}", channelOrderNumber, JSONTools.serialize(xyqbOrderHistoryStatusResult));
+            return historyOrderStatusVoModel;
+        }
     }
-  }
 
-  /**
-   * 贷前关单
-   *
-   * @param
-   * @return
-   */
-  public boolean cancelPreLoan(String channelOrderNumber) {
+    /**
+     * 贷前关单
+     *
+     * @param
+     * @return
+     */
+    public boolean cancelPreLoan(String channelOrderNumber) {
 
         /*Order order = this.orderRepository.findOrderByChannelOrderNumber(channelOrderNumber);
 
@@ -300,39 +315,39 @@ public class OrderService {
             return false;
         }*/
 
-    Long id = cancelPreLoanRepository.cancelPreLoan(channelOrderNumber);
+        Long id = cancelPreLoanRepository.cancelPreLoan(channelOrderNumber);
 
-    ConcurrentMap<Object, Object> data = Maps.newConcurrentMap();
-    data.put("data",id);
-    data.put("remark","系统关单");
-    String result = clothoCenter.cancelPreLoan(data);
-    return true;
-  }
+        ConcurrentMap<Object, Object> data = Maps.newConcurrentMap();
+        data.put("data", id);
+        data.put("remark", "系统关单");
+        String result = clothoCenter.cancelPreLoan(data);
+        return true;
+    }
 
-  /**
-   * 贷后关单
-   *
-   * @param
-   * @return
-   */
-  public boolean cancelAfterLoan(String channelOrderNumber) {
+    /**
+     * 贷后关单
+     *
+     * @param
+     * @return
+     */
+    public boolean cancelAfterLoan(String channelOrderNumber) {
 
-    ClfOrderMapping orderMapping = this.clfOrderMappingRepository.findByChannelOrderNoLastOne(channelOrderNumber);
+        ClfOrderMapping orderMapping = this.clfOrderMappingRepository.findByChannelOrderNoLastOne(channelOrderNumber);
 
-    if (orderMapping == null) {
-      log.info("cancelAfterLoan,贷后关单失败，无订单 channelOrderNumber={}", channelOrderNumber);
-      return false;
-    }
-    if (orderMapping.getLoanId() == null) {
-      log.info("cancelAfterLoan,贷后关单失败，loanId为空，channelOrderNumber={}", channelOrderNumber);
-      return false;
+        if (orderMapping == null) {
+            log.info("cancelAfterLoan,贷后关单失败，无订单 channelOrderNumber={}", channelOrderNumber);
+            return false;
+        }
+        if (orderMapping.getLoanId() == null) {
+            log.info("cancelAfterLoan,贷后关单失败，loanId为空，channelOrderNumber={}", channelOrderNumber);
+            return false;
+        }
+        ConcurrentMap<Object, Object> data = Maps.newConcurrentMap();
+        data.put("loanId", orderMapping.getLoanId());
+        data.put("userId", orderMapping.getQgUserId());
+        data.put("flowNo", UUID.randomUUID());
+        String id = clothoCenter.cancelAfterLoan(data);
+
+        return true;
     }
-    ConcurrentMap<Object, Object> data = Maps.newConcurrentMap();
-    data.put("loanId",orderMapping.getLoanId());
-    data.put("userId",orderMapping.getQgUserId());
-    data.put("flowNo", UUID.randomUUID());
-    String id = clothoCenter.cancelAfterLoan(data);
-
-    return true;
-  }
 }