xuq

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

@@ -94,8 +94,8 @@ public class OrderLogLogic {
                 index ++ ;
             }
 
-            String format = sdf3.format(pgOrderBase.getAppointmentTime());
-            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
+            String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
             context =context+"；申请时间："+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"；反馈内容："+pgOrderOperatorLog.getContent()
                     +",改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1;
@@ -112,8 +112,8 @@ public class OrderLogLogic {
         }
 
         if (pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.LAXIU.getRemark())){
-            String format = sdf3.format(pgOrderBase.getAppointmentTime());
-            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
+            String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
             pgOrderOperatorLog.setContent("改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
@@ -128,8 +128,8 @@ public class OrderLogLogic {
 
 
         if (pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.NOCALL.getRemark())){
-            String format = sdf3.format(pgOrderBase.getAppointmentTime());
-            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
+            String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
             pgOrderOperatorLog.setContent("改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
@@ -143,8 +143,8 @@ public class OrderLogLogic {
         }
 
         if (pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.YANWU.getRemark())){
-            String format = sdf3.format(pgOrderBase.getAppointmentTime());
-            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
+            String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
             pgOrderOperatorLog.setContent("延误类型："+pgOrderOperatorLog.getYwType()+",改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
@@ -159,8 +159,6 @@ public class OrderLogLogic {
 
 
         if (pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.ZHILIANG.getRemark())){
-            String format = sdf3.format(pgOrderBase.getAppointmentTime());
-            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
 
             pgOrderOperatorLog.setContent("质量反馈编号："+pgOrderOperatorLog.getZlNumber()+",反馈时间："+DateUtil.format(pgOrderOperatorLog.getFkTime(),"yyyy-MM-dd HH:mm:ss")
                     +"；反馈内容："+pgOrderOperatorLog.getContent());

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

@@ -125,8 +125,8 @@ public class OrderLogLogic {
                     .eq(PgOrderBase::getId, pgOrderOperatorLog.getOrderBaseId())
                     .update();
 
-            String format = sdf3.format(pgOrderBase.getAppointmentTime());
-            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
+            String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
             context =context+"；申请时间："+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"；反馈内容："+pgOrderOperatorLog.getContent()
                     +",改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1;
@@ -136,8 +136,8 @@ public class OrderLogLogic {
         }
 
         if (pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.LAXIU.getRemark())){
-            String format = sdf3.format(pgOrderBase.getAppointmentTime());
-            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
+            String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
             pgOrderOperatorLog.setContent("改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
@@ -153,8 +153,8 @@ public class OrderLogLogic {
 
 
         if (pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.NOCALL.getRemark())){
-            String format = sdf3.format(pgOrderBase.getAppointmentTime());
-            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
+            String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
             pgOrderOperatorLog.setContent("改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
@@ -169,8 +169,8 @@ public class OrderLogLogic {
         }
 
         if (pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.YANWU.getRemark())){
-            String format = sdf3.format(pgOrderBase.getAppointmentTime());
-            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
+            String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
 
             pgOrderOperatorLog.setContent("延误类型："+pgOrderOperatorLog.getYwType()+",改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
@@ -186,8 +186,6 @@ public class OrderLogLogic {
 
 
         if (pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.ZHILIANG.getRemark())){
-            String format = sdf3.format(pgOrderBase.getAppointmentTime());
-            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
 
             pgOrderOperatorLog.setContent("质量反馈编号："+pgOrderOperatorLog.getZlNumber()+",反馈时间："+DateUtil.format(pgOrderOperatorLog.getFkTime(),"yyyy-MM-dd HH:mm:ss")
                     +"；反馈内容："+pgOrderOperatorLog.getContent());