空指针异常处理

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -1149,6 +1149,15 @@ public class OrderSdkAdapter {
                 data.setGmtCompleteTime(Long.parseLong(orderInfoReqs.getReceiveTime()));
                 data.setGmtReceiveTime(Long.parseLong(orderInfoReqs.getReceiveTime()));
             }
+            if(orderInfoReqs.getDeliveryTime() != null){
+                data.setGmtDelivery(Long.decode(orderInfoReqs.getDeliveryTime()));
+            }
+            if(null != orderInfoReqs.getAfterSalesOrderList() &&  orderInfoReqs.getAfterSalesOrderList().size()>0){
+                AfterSalesOrderResp afterSalesOrderResp = orderInfoReqs.getAfterSalesOrderList().get(0);
+                if(AfterSalesStatus.COMPLETE.getIndex() == afterSalesOrderResp.getAfterSalesStatus()){
+                    data.setGmtRefundFinish(Long.parseLong(afterSalesOrderResp.getUpdateTime()));
+                }
+            }
 
         } catch (Exception e) {
             e.printStackTrace();

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -132,6 +132,8 @@ public class QueryOrdersResponse {
             private String customerOrder;
             private int evaluateStatus;
             private Long gmtAccept;
+            private Long gmtDelivery;
+            private Long gmtRefundFinish;
             /**
              * 自定义描述字段
              */

order-application-service/src/main/java/cn/freemud/service/impl/CheckMallOrder.java

@@ -120,16 +120,6 @@ public class CheckMallOrder {
         storeResponseDto.setBusinessHoursDayStartTime(startDateTime);
         storeResponseDto.setBusinessHoursDayEndTime(endDateTime);
 
-        // 校验门店是否打烊，打烊了则不让操作
-        if (storeResponseDto.getBusinessHoursDayStartTime() == null
-                || storeResponseDto.getBusinessHoursDayEndTime() == null) {
-            throw new ServiceException(ResponseResult.STORE_ITEM_STOP_BUSINESS);
-        }
-
-        // 桌号不为空，查数据库重新设置桌号
-        /*if (StringUtils.isNotBlank(createOrderVo.getTableNumber())) {
-            createOrderVo.setTableNumber(getTableNumber(partnerId, shopId, createOrderVo.getTableNumber()));
-        }*/
         createOrderVo.setStoreName(storeResponseDto.getStoreName());
         createOrderVo.setStoreAddress(storeResponseDto.getAddress());
         createOrderVo.setThirdShopId(storeResponseDto.getThirdPartCode());