Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderCreateServiceImpl.java

@@ -305,8 +305,10 @@ public class OrderCreateServiceImpl implements OrderCreateService {
         entity.setBeanTags(joinTags);
         entity.setIsMultiple(joinTags.contains("重物搬运") ? 1 : 0);
         entity.setBeanPriority(req.getPriority());
-        if (req.getPriority().equals("1") && !DateUtil.judgeTimeIsToday(entity.getExpectTimeBegin())) {
+        if (req.getPriority().equals("1")) {
+            if (!DateUtil.judgeTimeIsToday(entity.getExpectTimeBegin())) {
                 entity.setAppointmentMethod(AppointmentMethodEnum.AUTO_NOW.name());
+            }
             tags.add(OrderPeaTagsEnum.urgent.getTag());
             //发送通知分部消息
             // sendMsg(entity.getOrgBranchId(), orderId, entity.getExpectTimeBegin().toLocalDate());