解决空指针

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -1898,7 +1898,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                 }
                 //预约单
                 if(OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType())
-                        &&  configuration.getDeliveryProcessingBeforeMinute()>0){
+                     && configuration.getDeliveryProcessingBeforeMinute() != null   &&  configuration.getDeliveryProcessingBeforeMinute()>0){
                     timeout = QueryDeliveryType.SELF.getCode().equals(baseQueryOrderRequest.getDeliveryType())
                               //? AutoOrderConfigTime.getTime(configuration.getDeliveryProcessingBeforeMinute().toString())
                               ? configuration.getDeliveryProcessingBeforeMinute()

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

@@ -590,7 +590,7 @@ public class OrderServiceImpl implements Orderservice {
         }
         //支付回掉成功标记
         redisCache.save(RedisKeyConstant.KGD_PAYMENT_CALLBACK_FMID + message.getOut_trade_no(), message.getOut_trade_no(), 10L, TimeUnit.MINUTES);
-        if (message.getSource().equals(PaySuccessSource.OUTSIDE.getSource())) {
+        if (message.getSource() != null && message.getSource().equals(PaySuccessSource.OUTSIDE.getSource())) {
             log.info("调用券码核销==" + message.getTrans_id());
             verificationCoupon(message.getTrans_id());
             log.info("调用券码结束==" + message.getTrans_id());