Commit 9d837f66 by huangjinxin

fix:消息提醒优先级优化

1 parent 6dc6ddac
......@@ -439,6 +439,7 @@ public class OrderCreateServiceImpl implements OrderCreateService {
MsgDTO msgDTO = new MsgDTO();
msgDTO.setBranchId(branchId);
msgDTO.setType(0);
msgDTO.setTag(orderInfo.getBeanPriority().equals("1") ? 0 : 1);
msgDTO.setOrderIds(orderId);
msgDTO.setContent(String.format("有1条预约日期在%s的工单需人工外理,标签是(%s),单号:%S", toLocalDate, String.join(",", OrderUtil.handleTags(orderInfo)), orderId));
msgService.add(msgDTO);
......
......@@ -371,7 +371,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
teamId = null;
order.setAppointmentMethod(AppointmentMethodEnum.MANUAL.name());
order.setAppointmentStatus(OrderFlowEnum.INIT.name());
sendMsg(order.getOrgBranchId(), order.getOrderId(), req.getExpectBegin());
sendMsg(order.getOrgBranchId(), order.getOrderId(), req.getExpectBegin(), order);
}
} else {
// a.已派人-改约到未来
......@@ -408,7 +408,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
teamId = null;
order.setAppointmentMethod(AppointmentMethodEnum.MANUAL.name());
order.setAppointmentStatus(OrderFlowEnum.INIT.name());
sendMsg(order.getOrgBranchId(), order.getOrderId(), req.getExpectBegin());
sendMsg(order.getOrgBranchId(), order.getOrderId(), req.getExpectBegin(), order);
}
}
} else if (!isToday && !isBelong) {
......@@ -424,7 +424,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
teamId = null;
order.setAppointmentMethod(AppointmentMethodEnum.MANUAL.name());
order.setAppointmentStatus(OrderFlowEnum.INIT.name());
sendMsg(order.getOrgBranchId(), order.getOrderId(), req.getExpectBegin());
sendMsg(order.getOrgBranchId(), order.getOrderId(), req.getExpectBegin(), order);
}
}
......@@ -878,7 +878,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
order.setAppointmentMethod(AppointmentMethodEnum.MANUAL.name());
order.setAppointmentStatus(OrderFlowEnum.INIT.name());
OrgBranchEntity branchEntity = orgBranchDao.findByCitycodeListLike("%" + adminDistrict.getResult().getSubNames().getCity() + "%");
sendMsg(branchEntity.getBranchId(), order.getOrderId(), req.getExpectBegin());
sendMsg(branchEntity.getBranchId(), order.getOrderId(), req.getExpectBegin(), order);
} else {
// 根据分单工作队,填写clusterId/branchId/groupId/teamId等
OrgTeamInfo teamInfo = fendanResult.getResult();
......@@ -908,19 +908,19 @@ public class OrderInfoServiceImpl implements OrderInfoService {
order.setAppointmentMethod(AppointmentMethodEnum.MANUAL.name());
order.setAppointmentStatus(OrderFlowEnum.INIT.name());
//发送通知分部消息
sendMsg(order.getOrgBranchId(), order.getOrderId(), req.getExpectBegin());
sendMsg(order.getOrgBranchId(), order.getOrderId(), req.getExpectBegin(), order);
}
}
return order;
}
private void sendMsg(String branchId, String orderId, String reservationTime) {
private void sendMsg(String branchId, String orderId, String reservationTime, OrderInfoEntity order) {
//发送通知分部消息
MsgDTO msgDTO = new MsgDTO();
msgDTO.setBranchId(branchId);
msgDTO.setType(0);
msgDTO.setOrderIds(orderId);
msgDTO.setTag(1);
msgDTO.setTag(order.getBeanPriority().equals("1") ? 0 : 1);
msgDTO.setContent("有1条预约日期在" + reservationTime + "的工单需人工外理");
msgService.add(msgDTO);
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!