预约时间判断修改

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

@@ -393,8 +393,9 @@ public class OrderServiceImpl implements Orderservice {
         var1.setPayDate(DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss"));
         var1.setPayTransId(message.getOut_trade_no());
         var1.setOperator(orderBean.getUserName());
-        var1.setExpectTime(DateUtil.convert2String(new Date(orderBean.getGmtExpect()),DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
-
+        if(orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0){
+            var1.setExpectTime(DateUtil.convert2String(new Date(orderBean.getGmtExpect()),DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
+        }
         // 订单支付成功
         com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccess(var1);
         String string2 = JSONObject.toJSONString(payAccessRes);