Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderLogLogic.java

@@ -84,6 +84,11 @@ public class OrderLogLogic {
         String context ="";
 
         if (pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.DAIJIAN.getRemark())){
+
+
+            if (pgOrderBase.getAppointmentTime() == null)
+                throw new RemoteServiceException("未操作预约，请先操作预约");
+
             String[] split = pgOrderOperatorLog.getApplyNum().split(",|，");
 
             for (String s : split) {

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderLogLogic.java

@@ -108,6 +108,11 @@ public class OrderLogLogic {
         String context ="";
 
         if (pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.DAIJIAN.getRemark())){
+
+            if (pgOrderBase.getAppointmentTime() == null)
+                throw new RemoteServiceException("未操作预约，请先操作预约");
+
+
             String[] split = pgOrderOperatorLog.getApplyNum().split(",|，");
 
             for (String s : split) {