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,41 +372,6 @@ public class KylinOrderTicketsRefundServiceImpl {
                 } catch (Exception e) {
                     log.error("expressPlaceFromJsonException e:[{}]", e);
                 }
-                // 生成快递单 失败也生成记录备用
-                HashMap hashMapResult = (HashMap) hashMap.get("result");
-                // 生成预快递单 REDIS 队列入数据库
-                LocalDateTime now = LocalDateTime.now();
-                LinkedList<String> sqls = CollectionUtil.linkedListString();
-                sqls.add(SqlMapping.get("kylin_order_refund.refundOrderExpress"));
-                LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
-                String remark = (String) hashMapResult.get("remark");
-                String proName = (String) hashMapResult.get("proName");
-                String goodsValueTotal = (String) hashMapResult.get("goodsValueTotal");
-                String goodsNumber = (String) hashMapResult.get("goodsNumber");
-                remark = (null == remark) ? "" : remark;
-                proName = (null == proName) ? "" : proName;
-                goodsValueTotal = (null == goodsValueTotal) ? "" : goodsValueTotal;
-                goodsNumber = (null == goodsNumber) ? "" : goodsNumber;
-                String mailno = (String) hashMapResult.get("mailno");
-                String filterResult = (String) hashMapResult.get("filter_result");
-                String cargoTypeCode = (String) hashMapResult.get("cargoTypeCode");
-                String limitTypeCode = (String) hashMapResult.get("limitTypeCode");
-                String expressTypeCode = (String) hashMapResult.get("expressTypeCode");
-                mailno = (null == mailno) ? "" : mailno;
-                filterResult = (null == filterResult) ? "" : filterResult;
-                cargoTypeCode = (null == cargoTypeCode) ? "" : cargoTypeCode;
-                limitTypeCode = (null == limitTypeCode) ? "" : limitTypeCode;
-                expressTypeCode = (null == expressTypeCode) ? "" : expressTypeCode;
-                sqlsDataA.add(new Object[]{
-                        orderExpressId, orderTicketVo.getPerformanceId(), orderTicketVo.getOrderTicketsId(), orderRefundId,
-                        OrderExpressCode, mailno, expressType, filterResult, remark, KylinTableStatusConst.ORDER_EXPRESS_STATUS2
-                        , 2, sendExpressType, expressContacts, expressPhone, sendExpressAddress, appointmentTime
-                        , proName, cargoTypeCode, limitTypeCode, expressTypeCode, goodsValueTotal, goodsNumber
-                        , now
-                });
-                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 = "";
@@ -416,6 +381,40 @@ public class KylinOrderTicketsRefundServiceImpl {
                         msg = (String) hashMap.get("msg");
                     }
                 } else { // 成功下单记录缓存
+                    // 生成快递单
+                    HashMap hashMapResult = (HashMap) hashMap.get("result");
+                    LocalDateTime now = LocalDateTime.now();
+                    LinkedList<String> sqls = CollectionUtil.linkedListString();
+                    sqls.add(SqlMapping.get("kylin_order_refund.refundOrderExpress"));
+                    LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
+                    String remark = (String) hashMapResult.get("remark");
+                    String proName = (String) hashMapResult.get("proName");
+                    String goodsValueTotal = (String) hashMapResult.get("goodsValueTotal");
+                    String goodsNumber = (String) hashMapResult.get("goodsNumber");
+                    remark = (null == remark) ? "" : remark;
+                    proName = (null == proName) ? "" : proName;
+                    goodsValueTotal = (null == goodsValueTotal) ? "" : goodsValueTotal;
+                    goodsNumber = (null == goodsNumber) ? "" : goodsNumber;
+                    String mailno = (String) hashMapResult.get("mailno");
+                    String filterResult = (String) hashMapResult.get("filter_result");
+                    String cargoTypeCode = (String) hashMapResult.get("cargoTypeCode");
+                    String limitTypeCode = (String) hashMapResult.get("limitTypeCode");
+                    String expressTypeCode = (String) hashMapResult.get("expressTypeCode");
+                    mailno = (null == mailno) ? "" : mailno;
+                    filterResult = (null == filterResult) ? "" : filterResult;
+                    cargoTypeCode = (null == cargoTypeCode) ? "" : cargoTypeCode;
+                    limitTypeCode = (null == limitTypeCode) ? "" : limitTypeCode;
+                    expressTypeCode = (null == expressTypeCode) ? "" : expressTypeCode;
+                    sqlsDataA.add(new Object[]{
+                            orderExpressId, orderTicketVo.getPerformanceId(), orderTicketVo.getOrderTicketsId(), orderRefundId,
+                            OrderExpressCode, mailno, expressType, filterResult, remark, KylinTableStatusConst.ORDER_EXPRESS_STATUS2
+                            , 2, sendExpressType, expressContacts, expressPhone, sendExpressAddress, appointmentTime
+                            , proName, cargoTypeCode, limitTypeCode, expressTypeCode, goodsValueTotal, goodsNumber
+                            , 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());