快递下单更改

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

@@ -325,6 +325,10 @@ public class KylinOrderTicketsRefundServiceImpl {
     @Async
     public void expressPlace(Integer sendExpressType, String expressNumber, String expressContacts, String expressPhone, String sendExpressAddress, String appointmentTime, KylinOrderTicketVo orderTicketVo, KylinPerformanceVo performanceVo, String orderRefundId) {
         try {
+            Thread.sleep(1000 * 60);
+            log.info("expressPlaceParams [sendExpressType:{}, expressContacts:{}, expressPhone:{}, sendExpressAddress:{}, appointmentTime:{}, orderRefundId:{}]",
+                    sendExpressType, expressContacts, expressPhone, sendExpressAddress, appointmentTime, orderRefundId);
+
             expressContacts = (null == expressContacts) ? "" : expressContacts;
             expressPhone = (null == expressPhone) ? "" : expressPhone;
             sendExpressAddress = (null == sendExpressAddress) ? "" : sendExpressAddress;
@@ -366,21 +370,9 @@ public class KylinOrderTicketsRefundServiceImpl {
                 try {
                     hashMap = JsonUtils.fromJson(result, HashMap.class);
                 } catch (Exception e) {
-                    log.info("expressPlaceParams sendExpressType:[{}], expressNumber:[{}], expressContacts:[{}], expressPhone:[{}], sendExpressAddress:[{}], appointmentTime:[{}], orderTicketVo:[{}], performanceVo:[{}]",
-                            sendExpressType, expressNumber, expressContacts, expressPhone, sendExpressAddress, appointmentTime, orderTicketVo, performanceVo);
                     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");
-                    }
-                    log.info("expressPlaceParams sendExpressType:[{}], expressNumber:[{}], expressContacts:[{}], expressPhone:[{}], sendExpressAddress:[{}], appointmentTime:[{}], orderTicketVo:[{}], performanceVo:[{}]",
-                            sendExpressType, expressNumber, expressContacts, expressPhone, sendExpressAddress, appointmentTime, orderTicketVo, performanceVo);
-                    log.error("expressPlaceResultError msg:[{}]", msg);
-                } else {
+                // 生成快递单 失败也生成记录备用
                 HashMap hashMapResult = (HashMap) hashMap.get("result");
                 // 生成预快递单 REDIS 队列入数据库
                 LocalDateTime now = LocalDateTime.now();
@@ -395,15 +387,35 @@ public class KylinOrderTicketsRefundServiceImpl {
                 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, hashMapResult.get("mailno"), expressType, hashMapResult.get("filter_result"), remark, KylinTableStatusConst.ORDER_EXPRESS_STATUS2
+                        orderExpressId, orderTicketVo.getPerformanceId(), orderTicketVo.getOrderTicketsId(), orderRefundId,
+                        OrderExpressCode, mailno, expressType, filterResult, remark, KylinTableStatusConst.ORDER_EXPRESS_STATUS2
                         , 2, sendExpressType, expressContacts, expressPhone, sendExpressAddress, appointmentTime
-                            , proName, hashMapResult.get("cargoTypeCode"), hashMapResult.get("limitTypeCode"), hashMapResult.get("expressTypeCode"), goodsValueTotal, goodsNumber
+                        , 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 = "";
+                    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());
@@ -414,7 +426,7 @@ public class KylinOrderTicketsRefundServiceImpl {
                     dataUtils.setOrderRefundExpressInfo(orderTicketVo.getOrderTicketsId(), kylinOrderExpressVo);
                 }
             } else if (sendExpressType == 2) { // 自主发货
-                // 生成预快递单 REDIS 队列入数据库
+                // 生成快递单 REDIS 队列入数据库
                 String orderExpressId = IDGenerator.nextSnowId();
                 String OrderExpressCode = "NOWUR" + orderExpressId;
                 LocalDateTime now = LocalDateTime.now();