需求

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

@@ -75,6 +75,7 @@ public class OrderLogLogic {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat sdf2 = new SimpleDateFormat("HH");
+        SimpleDateFormat sdf3 = new SimpleDateFormat("HH:mm");
 
         //预约
         if(pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.YUYUE.getRemark())){
@@ -89,7 +90,11 @@ public class OrderLogLogic {
             String s = hour >= 12 ? "下午" : "上午";
             String text = StringUtil.isEmpty(pgOrderOperatorLog.getContent())?"":(pgOrderOperatorLog.getContent()+"，");
 
-            pgOrderOperatorLog.setContent(text+"预约时间:"+sdf.format(pgOrderOperatorLog.getAppointmentTime()));
+            String format = sdf3.format(pgOrderBase.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
+
+            pgOrderOperatorLog.setContent(text+"预约时间:"+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1);
+
         }
         //改约
         if(pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.GAIYUE.getRemark())){
@@ -104,7 +109,11 @@ public class OrderLogLogic {
 
             String text = StringUtil.isEmpty(pgOrderOperatorLog.getContent())?"":(pgOrderOperatorLog.getContent()+"，");
 
-            pgOrderOperatorLog.setContent(text+"预约时间:"+sdf.format(pgOrderOperatorLog.getAppointmentTime()));
+            String format = sdf3.format(pgOrderBase.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
+
+
+            pgOrderOperatorLog.setContent(text+"预约时间:"+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1);
         }
         //异常
         if(pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.YCFK.getRemark())){

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

@@ -1212,11 +1212,15 @@ public class OrderBaseLogic {
         if (pgOrderBase.getAppointmentTime() != null) {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             SimpleDateFormat sdf2 = new SimpleDateFormat("HH");
+            SimpleDateFormat sdf3 = new SimpleDateFormat("HH:mm");
             int hour = Integer.parseInt(sdf2.format(pgOrderBase.getAppointmentTime()));
             String s = hour >= 12 ? "下午" : "上午";
 
+            String format = sdf3.format(pgOrderBase.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
+
             String s2 = StringUtils.isNotBlank(pgOrderBase.getAppointmentRemark()) ? "备注:" + pgOrderBase.getAppointmentRemark() : "";
-            orderLogLogic.addLog(pgOrderBase.getId(), "用户预约", "预约时间:" + sdf.format(pgOrderBase.getAppointmentTime()) + " "  + "," + s2, websitName);
+            orderLogLogic.addLog(pgOrderBase.getId(), "用户预约", "预约时间:" + sdf.format(pgOrderBase.getAppointmentTime())+" "+format+"-"+format1 + " "  + "," + s2, websitName);
         }
     }
 

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

@@ -98,6 +98,7 @@ public class OrderLogLogic {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat sdf2 = new SimpleDateFormat("HH");
+        SimpleDateFormat sdf3 = new SimpleDateFormat("HH:mm");
 
         //预约
         if(pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.YUYUEY.getKey())){
@@ -110,12 +111,15 @@ public class OrderLogLogic {
             }
 */
 
+            String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
+
             int hour = Integer.parseInt(sdf2.format(pgOrderOperatorLog.getAppointmentTime()));
             String s = hour >= 12 ? "下午" : "上午";
 
             String text = StringUtil.isEmpty(pgOrderOperatorLog.getContent())?"":(pgOrderOperatorLog.getContent()+"，");
 
-            pgOrderOperatorLog.setContent(text+"预约时间:"+sdf.format(pgOrderOperatorLog.getAppointmentTime()));
+            pgOrderOperatorLog.setContent(text+"预约时间:"+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1);
         }
         //改约
         if(pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.GAIYUE.getKey())){
@@ -126,11 +130,14 @@ public class OrderLogLogic {
                 throw new RemoteServiceException("改约时间不可小于当前时间");
             }
 
+            String format = sdf3.format(pgOrderOperatorLog.getAppointmentTime());
+            String format1 = sdf3.format(pgOrderOperatorLog.getAppointmentEndTime());
+
             int hour = Integer.parseInt(sdf2.format(pgOrderOperatorLog.getAppointmentTime()));
             String s = hour >= 12 ? "下午" : "上午";
             String text = StringUtil.isEmpty(pgOrderOperatorLog.getContent())?"":(pgOrderOperatorLog.getContent()+"，");
 
-            pgOrderOperatorLog.setContent(text+"预约时间:"+sdf.format(pgOrderOperatorLog.getAppointmentTime()));
+            pgOrderOperatorLog.setContent(text+"预约时间:"+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1);
         }
         //已完工
         if(pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.WGFK.getKey())){