演出订单和列表获取快递状态

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java

@@ -16,7 +16,8 @@ public class KylinRedisConst {
     public static final String SURPLUS_EXCHANGE = "surplusExchange";
     public static final String TICKET = "kylin:ticket:id:";
     public static final String ORDER = "kylin:order:id:";
-    public static final String ORDER_ROUTE_INFO = "kylin::order:route_info:id:";
+    public static final String ORDER_ROUTE_INFO = "kylin::order:routeInfo:id:";
+    public static final String ORDER_EXPRESS_STATUS = "kylin::order:ExpressStatus:id:";
     public static final String ORDER_ENTITIES = "kylin:order_entities:id:";
     public static final String TIMES = "kylin:times:id:";
     public static final String AGENT = "kylin:agent:info";

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderListVo.java

@@ -22,9 +22,7 @@ public class KylinOrderListVo implements Serializable {
     private BigDecimal priceActual;
     private Integer number;
     private Integer status;
-    private String express_number;
-    private String express_company;
-    private Integer kuaidi_status;
+    private Integer expressStatus;
     private String getTicketType;
     private String createdAt;
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderDetailsVo.java

@@ -9,9 +9,7 @@ import java.util.List;
 public class OrderDetailsVo {
     private KylinOrderTicketVo orderTicketVo;
     private String enterDescribe;
-    private String express_number;
-    private String express_company;
-    private Integer kuaidi_status;
+    private Integer expressStatus;
     private Long restTime;
     private Integer isCanRefund;
     private List<KylinOrderRefundsOrderCodeVo> orderRefundsVoList;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -865,17 +865,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             List<KylinOrderListVo> voList = dataUtils.getOrderList(uid);
             for (int i = 0; i < voList.size(); i++) {
                 KylinOrderListVo item = voList.get(i);
+
                 //TODO 顺丰快递
-                Object expresses = null;
-                if (null != expresses) {
-                    item.setExpress_number("");//expresses.getNumber()
-                    item.setExpress_company("");//expresses.getName()
-                    item.setKuaidi_status(-2);//expresses.getStatus()
-                } else {
-                    item.setExpress_number("");
-                    item.setExpress_company("");
-                    item.setKuaidi_status(-2);
-                }
+                Integer orderExpressStatus = dataUtils.getOrderExpressStatus(item.getOrderTicketsId());
+                item.setExpressStatus(orderExpressStatus);
 
                 if (item.getStatus().equals(KylinTableStatusConst.ORDER_STATUS0)) {
                     try {
@@ -925,8 +918,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 return null;
             }
             if (null != orderTicketVo) {
-                //TODO 顺丰快递
-                Object expresses = null;
                 KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
                 currentTime = System.currentTimeMillis() - currentTime;
                 log.debug("获取演出详情 -> time:" + (currentTime) + "毫秒");
@@ -991,16 +982,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 }
                 currentTime = System.currentTimeMillis() - currentTime;
                 log.debug("获取倒计时 -> time:" + (currentTime) + "毫秒");
-                //快递
-                if (null != expresses) {
-                    vo.setExpress_number("");//expresses.getNumber()
-                    vo.setExpress_company("");//expresses.getName()
-                    vo.setKuaidi_status(-2);//expresses.getStatus()
-                } else {
-                    vo.setExpress_number("");
-                    vo.setExpress_company("");
-                    vo.setKuaidi_status(-2);
-                }
+
+                //TODO 顺丰快递
+                Integer orderExpressStatus = dataUtils.getOrderExpressStatus(orderTicketVo.getOrderTicketsId());
+                vo.setExpressStatus(orderExpressStatus);
 
                 if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
                     LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java

@@ -644,4 +644,15 @@ public class DataUtils {
         }
         return refundSinglePrice;
     }
+
+    /**
+     * 获取订单快递状态
+     */
+    public Integer getOrderExpressStatus(String orderId) {
+        String redisKey = KylinRedisConst.ORDER_EXPRESS_STATUS.concat(orderId);
+        if (!redisUtil.hasKey(redisKey)) {
+            return 1;
+        }
+        return (Integer) redisUtil.get(redisKey);
+    }
 }