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

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

@@ -132,6 +132,12 @@ public class ChangeOrderLogic {
             if (pgOrderBase.getAppointmentTime() != null)
                 throw new RemoteServiceException("已操作预约无需操作");
         }
+
+        if (type.equals(OrderOperatorLogTypeEnum.GAIYUE.getRemark())){
+            PgOrderBase pgOrderBase = pgOrderBaseService.getById(id);
+            if (pgOrderBase.getAppointmentTime() == null)
+                throw new RemoteServiceException("未操作预约，请操作预约");
+        }
         pgOrderBaseService.lambdaUpdate()
                 .eq(PgOrderBase::getId,id)
                 .set(PgOrderBase::getAppointmentTime,appointmentTime)

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

@@ -112,6 +112,10 @@ public class OrderLogLogic {
         }
 
         if (pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.LAXIU.getRemark())){
+
+            if (pgOrderBase.getAppointmentTime() == null)
+                throw new RemoteServiceException("未操作预约，请先操作预约");
+
             String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
             String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
@@ -131,6 +135,9 @@ public class OrderLogLogic {
             String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
             String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
+            if (pgOrderBase.getAppointmentTime() == null)
+                throw new RemoteServiceException("未操作预约，请先操作预约");
+
             pgOrderOperatorLog.setContent("改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
 
@@ -146,6 +153,9 @@ public class OrderLogLogic {
             String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
             String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
+            if (pgOrderBase.getAppointmentTime() == null)
+                throw new RemoteServiceException("未操作预约，请先操作预约");
+
             pgOrderOperatorLog.setContent("延误类型："+pgOrderOperatorLog.getYwType()+",改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
 

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

@@ -139,6 +139,9 @@ public class OrderLogLogic {
             String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
             String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
+            if (pgOrderBase.getAppointmentTime() == null)
+                throw new RemoteServiceException("未操作预约，请先操作预约");
+
             pgOrderOperatorLog.setContent("改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
 
@@ -156,6 +159,9 @@ public class OrderLogLogic {
             String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
             String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
+            if (pgOrderBase.getAppointmentTime() == null)
+                throw new RemoteServiceException("未操作预约，请先操作预约");
+
             pgOrderOperatorLog.setContent("改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
 
@@ -172,6 +178,9 @@ public class OrderLogLogic {
             String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
             String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
+            if (pgOrderBase.getAppointmentTime() == null)
+                throw new RemoteServiceException("未操作预约，请先操作预约");
+
             pgOrderOperatorLog.setContent("延误类型："+pgOrderOperatorLog.getYwType()+",改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
 
@@ -215,6 +224,10 @@ public class OrderLogLogic {
         }
         //改约
         if(pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.GAIYUE.getKey())){
+
+            if (pgOrderBase.getAppointmentTime() == null)
+                throw new RemoteServiceException("未操作预约，请先操作预约");
+
             if(pgOrderBase.getOrderStatus().equals(OrderBaseStatusEnum.YWG.getKey()) || pgOrderBase.getOrderStatus().equals(OrderBaseStatusEnum.YJS.getKey())){
                 throw new RemoteServiceException("已完工工单请勿操作改约");
             }