需求

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

@@ -195,6 +195,12 @@ public class OrderBaseLogic {
             orderStatusList.add(orderStatus);
         }
 
+        if(StringUtils.equals(orderStatus, OrderBaseStatusEnum.FWZ.getKey())){
+            orderStatusList.add(OrderBaseStatusEnum.FWZ.getKey());
+            orderStatusList.add(OrderBaseStatusEnum.GCSZT.getKey());
+            orderStatusList.add(OrderBaseStatusEnum.BFWG.getKey());
+        }
+
         Page page = pgOrderBaseService.lambdaQuery()
                 .eq(PgOrderBase::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
                 .ne(PgOrderBase::getOrderStatus,OrderBaseStatusEnum.YQX.getKey())

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

@@ -1216,7 +1216,7 @@ public class OrderBaseLogic {
             String s = hour >= 12 ? "下午" : "上午";
 
             String s2 = StringUtils.isNotBlank(pgOrderBase.getAppointmentRemark()) ? "备注:" + pgOrderBase.getAppointmentRemark() : "";
-            orderLogLogic.addLog(pgOrderBase.getId(), "用户预约", "预约时间:" + sdf.format(pgOrderBase.getAppointmentTime()) + " " + s + "," + s2, websitName);
+            orderLogLogic.addLog(pgOrderBase.getId(), "用户预约", "预约时间:" + sdf.format(pgOrderBase.getAppointmentTime()) + " "  + "," + s2, websitName);
         }
     }
 

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

@@ -115,7 +115,7 @@ public class OrderLogLogic {
 
             String text = StringUtil.isEmpty(pgOrderOperatorLog.getContent())?"":(pgOrderOperatorLog.getContent()+"，");
 
-            pgOrderOperatorLog.setContent(text+"预约时间:"+sdf.format(pgOrderOperatorLog.getAppointmentTime())+"，"+s);
+            pgOrderOperatorLog.setContent(text+"预约时间:"+sdf.format(pgOrderOperatorLog.getAppointmentTime()));
         }
         //改约
         if(pgOrderOperatorLog.getType().equals(OrderOperatorLogTypeEnum.GAIYUE.getKey())){