解决预约单空指针

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());
@@ -3798,7 +3798,7 @@ public class OrderServiceImpl implements Orderservice {
 
         String ebCode = this.getPayCodeByChanel(paymentRequest.getWxAppId(), channel, storeId);
         OrderPayResponse orderPayResponse = new OrderPayResponse();
-        ;
+
         if (StringUtils.isBlank(ebCode)) {
             orderPayResponse.setMsg("请先联系相关人员配置商户对应的支付渠道");
             return orderPayResponse;
@@ -3979,6 +3979,7 @@ public class OrderServiceImpl implements Orderservice {
         log.info("payment timeout callback for refund orderDto={}", JSON.toJSONString(orderBean));
         Integer abState = 4;
         String noPay = "8200404";
+        //4 表示订单已经退款了
         if (abState.equals(orderBean.getAbnormalState())) {
             log.info("payment timeout callback for refund is exist");
             return;
@@ -4007,7 +4008,7 @@ public class OrderServiceImpl implements Orderservice {
             sdkUpdateAbnormalState.setAbnormalDesc(desc + ",退款失败");
         }
         sdkUpdateAbnormalState.setPartnerId(orderBean.getCompanyId());
-        sdkUpdateAbnormalState.setAbnormalState(4);
+        sdkUpdateAbnormalState.setAbnormalState(4);//
         sdkUpdateAbnormalState.setOrderCode(orderBean.getOid());
         orderSdkService.updateAbnormalState(sdkUpdateAbnormalState);
     }