自主发货、退款详情展示快递单号

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

@@ -19,6 +19,7 @@ public class KylinRedisConst {
     public static final String ORDER = "kylin:order:id:";
     public static final String ORDER_ROUTE_INFO = "kylin:order:routeInfo:id:";
     public static final String ORDER_EXPRESS_INFO = "kylin:order:ExpressStatus:id:";
+    public static final String ORDER_REFUND_EXPRESS_INFO = "kylin:order:refund: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/OrderRefundVo.java

 package com.liquidnet.service.kylin.dto.vo.returns;
 
+import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
-public class OrderRefundVo implements Cloneable{
+public class OrderRefundVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = 579833525354708457L;
     private KylinOrderTicketVo orderTicketVo;
     private KylinOrderRefundsVo kylinOrderRefundsVoBaseList;
+    private KylinOrderExpressVo kylinOrderExpressVo;
 
     private static final OrderRefundVo obj = new OrderRefundVo();
+
     public static OrderRefundVo getNew() {
         try {
             return (OrderRefundVo) obj.clone();

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

@@ -407,6 +407,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             }
             vo.setKylinOrderRefundsVoBaseList(kylinOrderRefundsVoBase);
             vo.setOrderTicketVo(orderTicketVo);
+            vo.setKylinOrderExpressVo(dataUtils.getOrderRefundExpressInfo(orderId));
             return ResponseDto.success(vo);
         } catch (Exception e) {
             e.printStackTrace();
@@ -561,10 +562,32 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 kylinOrderExpressVo.setOrderExpressCode(OrderExpressCode);
                 kylinOrderExpressVo.setMailno((String) hashMapResult.get("mailno"));
                 kylinOrderExpressVo.setExpressStatus(KylinTableStatusConst.ORDER_EXPRESS_STATUS2);
-                dataUtils.setOrderExpressInfo(orderTicketVo.getOrderTicketsId(), kylinOrderExpressVo);
+                dataUtils.setOrderRefundExpressInfo(orderTicketVo.getOrderTicketsId(), kylinOrderExpressVo);
             }
         } else if (sendExpressType == 2) { // 自主发货
-
+            // 生成预快递单 REDIS 队列入数据库
+            String orderExpressId = IDGenerator.nextSnowId();
+            String OrderExpressCode = "NEWUR" + orderExpressId;
+            LocalDateTime now = LocalDateTime.now();
+            LinkedList<String> sqls = CollectionUtil.linkedListString();
+            sqls.add(SqlMapping.get("kylin_order_refund.refundOrderExpress"));
+            LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
+            sqlsDataA.add(new Object[]{
+                    orderExpressId, orderTicketVo.getPerformanceId(), orderTicketVo.getOrderTicketsId(), OrderExpressCode, expressNumber, expressType, "", "", KylinTableStatusConst.ORDER_EXPRESS_STATUS2
+                    , 2, sendExpressType, expressContacts, expressPhone, sendExpressAddress, appointmentTime
+                    , "", "", "", "", "", ""
+                    , now
+            });
+            queueUtils.sendMsgByRedis(MQConst.KylinQueue.SQL_ORDER_REFUND_EXPRESS.getKey(),
+                    SqlMapping.gets(sqls, sqlsDataA));
+
+            KylinOrderExpressVo kylinOrderExpressVo = KylinOrderExpressVo.getNew();
+            kylinOrderExpressVo.setOrderExpressId(orderExpressId);
+            kylinOrderExpressVo.setOrderTicketsId(orderTicketVo.getOrderTicketsId());
+            kylinOrderExpressVo.setOrderExpressCode(OrderExpressCode);
+            kylinOrderExpressVo.setMailno(expressNumber);
+            kylinOrderExpressVo.setExpressStatus(KylinTableStatusConst.ORDER_EXPRESS_STATUS2);
+            dataUtils.setOrderRefundExpressInfo(orderTicketVo.getOrderTicketsId(), kylinOrderExpressVo);
         }
     }
 

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

@@ -749,13 +749,13 @@ public class DataUtils {
         }
     }
 
-    /**
-     * 演出订单快递信息
-     * @param orderId
-     * @param kylinOrderExpressVo
-     */
-    public void setOrderExpressInfo(String orderId, KylinOrderExpressVo kylinOrderExpressVo) {
-        String redisKey = KylinRedisConst.ORDER_EXPRESS_INFO.concat(orderId);
+    // 快递票退款物流信息
+    public void setOrderRefundExpressInfo(String orderId, KylinOrderExpressVo kylinOrderExpressVo) {
+        String redisKey = KylinRedisConst.ORDER_REFUND_EXPRESS_INFO.concat(orderId);
         redisUtil.set(redisKey, kylinOrderExpressVo);
     }
+    public KylinOrderExpressVo getOrderRefundExpressInfo(String orderId) {
+        String redisKey = KylinRedisConst.ORDER_REFUND_EXPRESS_INFO.concat(orderId);
+        return (KylinOrderExpressVo) redisUtil.get(redisKey);
+    }
 }