Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant

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

@@ -372,9 +372,17 @@ public class KylinOrderTicketsRefundServiceImpl {
                 } catch (Exception e) {
                     log.error("expressPlaceFromJsonException e:[{}]", e);
                 }
-                // 生成快递单 失败也生成记录备用
+
+                if (null == hashMap.get("succ") || hashMap.get("succ").equals("fail")) {
+                    String msg = "";
+                    if (null == hashMap.get("succ")) {
+                        msg = result;
+                    } else {
+                        msg = (String) hashMap.get("msg");
+                    }
+                } else { // 成功下单记录缓存
+                    // 生成快递单
                     HashMap hashMapResult = (HashMap) hashMap.get("result");
-                // 生成预快递单 REDIS 队列入数据库
                     LocalDateTime now = LocalDateTime.now();
                     LinkedList<String> sqls = CollectionUtil.linkedListString();
                     sqls.add(SqlMapping.get("kylin_order_refund.refundOrderExpress"));
@@ -407,15 +415,6 @@ public class KylinOrderTicketsRefundServiceImpl {
                     queueUtils.sendMsgByRedis(MQConst.KylinQueue.SQL_ORDER_REFUND_EXPRESS.getKey(),
                             SqlMapping.gets(sqls, sqlsDataA));
 
-
-                if (null == hashMap.get("succ") || hashMap.get("succ").equals("fail")) {
-                    String msg = "";
-                    if (null == hashMap.get("succ")) {
-                        msg = result;
-                    } else {
-                        msg = (String) hashMap.get("msg");
-                    }
-                } else { // 成功下单记录缓存
                     KylinOrderExpressVo kylinOrderExpressVo = KylinOrderExpressVo.getNew();
                     kylinOrderExpressVo.setOrderExpressId(orderExpressId);
                     kylinOrderExpressVo.setOrderTicketsId(orderTicketVo.getOrderTicketsId());