sql null

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

@@ -314,6 +314,10 @@ public class KylinOrderTicketsRefundServiceImpl {
 
     @Async
     public void expressPlace(Integer sendExpressType, String expressNumber, String expressContacts, String expressPhone, String sendExpressAddress, String appointmentTime, KylinOrderTicketVo orderTicketVo, KylinPerformanceVo performanceVo) {
+        expressContacts = (null == expressContacts) ? "" : expressContacts;
+        expressPhone = (null == expressPhone) ? "" : expressPhone;
+        sendExpressAddress = (null == sendExpressAddress) ? "" : sendExpressAddress;
+        appointmentTime = (null == appointmentTime) ? "" : appointmentTime;
         if (sendExpressType == 1) { // 上门取件
             // 请求下单数据
             Map<String, String> hBody = new HashMap<>();
@@ -371,8 +375,9 @@ public class KylinOrderTicketsRefundServiceImpl {
                 LinkedList<String> sqls = CollectionUtil.linkedListString();
                 sqls.add(SqlMapping.get("kylin_order_refund.refundOrderExpress"));
                 LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
+                String remark = (String) hashMapResult.get("remark");
                 sqlsDataA.add(new Object[]{
-                        orderExpressId, orderTicketVo.getPerformanceId(), orderTicketVo.getOrderTicketsId(), OrderExpressCode, hashMapResult.get("mailno"), expressType, hashMapResult.get("filter_result"), hashMapResult.get("remark"), KylinTableStatusConst.ORDER_EXPRESS_STATUS2
+                        orderExpressId, orderTicketVo.getPerformanceId(), orderTicketVo.getOrderTicketsId(), OrderExpressCode, hashMapResult.get("mailno"), expressType, hashMapResult.get("filter_result"), remark, KylinTableStatusConst.ORDER_EXPRESS_STATUS2
                         , 2, sendExpressType, expressContacts, expressPhone, sendExpressAddress, appointmentTime
                         , hashMapResult.get("proName"), hashMapResult.get("cargoTypeCode"), hashMapResult.get("limitTypeCode"), hashMapResult.get("expressTypeCode"), hashMapResult.get("goodsValueTotal"), hashMapResult.get("goodsNumber")
                         , now
@@ -392,7 +397,7 @@ public class KylinOrderTicketsRefundServiceImpl {
         } else if (sendExpressType == 2) { // 自主发货
             // 生成预快递单 REDIS 队列入数据库
             String orderExpressId = IDGenerator.nextSnowId();
-            String OrderExpressCode = "NEWUR" + orderExpressId;
+            String OrderExpressCode = "NOWUR" + orderExpressId;
             LocalDateTime now = LocalDateTime.now();
             LinkedList<String> sqls = CollectionUtil.linkedListString();
             sqls.add(SqlMapping.get("kylin_order_refund.refundOrderExpress"));