Skip to content

O
on-site-service
Commit befc7fe1 authored by lining's avatar lining
Browse files
Options

feat: 估价员上门时间

parent eda05387
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 12 deletions
common/src/main/java/com/onsiteservice/common/order/vo/ServiceOrderLogVO.java
View file @ befc7fe1
...@@ -25,4 +25,7 @@ public class ServiceOrderLogVO { ...@@ -25,4 +25,7 @@ public class ServiceOrderLogVO {
@ApiModelProperty(value = "流程发生时间") @ApiModelProperty(value = "流程发生时间")
private Date createTime; private Date createTime;
@ApiModelProperty(value = "估价员上门时间")
private Date expectArrivalTime;
} }
\ No newline at end of file
common/src/main/java/com/onsiteservice/service/order/ServiceOrderService.java
View file @ befc7fe1
...@@ -94,7 +94,8 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> { ...@@ -94,7 +94,8 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
if (result == 1) { if (result == 1) {
String description = String.format(ServiceOrderStatusEnum.VALUATION.getMsg(), user.getUserName(), serviceValuator.getName()); String description = String.format(ServiceOrderStatusEnum.VALUATION.getMsg(), user.getUserName(), serviceValuator.getName());
recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.VALUATION.getStatus(), description, sourceEnum, serviceValuator.getId(), dto.getRemark()); recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.VALUATION.getStatus(), description,
sourceEnum, serviceValuator.getId(), dto.getRemark(), dto.getExpectArrivalTime());
} }
return result; return result;
...@@ -122,7 +123,8 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> { ...@@ -122,7 +123,8 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
if (result == 1) { if (result == 1) {
String description = String.format(ServiceOrderStatusEnum.REVALUATION.getMsg(), user.getUserName(), serviceValuator.getName()); String description = String.format(ServiceOrderStatusEnum.REVALUATION.getMsg(), user.getUserName(), serviceValuator.getName());
recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.REVALUATION.getStatus(), description, sourceEnum, serviceValuator.getId(), dto.getRemark()); recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.REVALUATION.getStatus(), description,
sourceEnum, serviceValuator.getId(), dto.getRemark(), dto.getExpectArrivalTime());
} }
return result; return result;
...@@ -170,7 +172,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> { ...@@ -170,7 +172,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
if (result == 1) { if (result == 1) {
boolean isAdmin = user.getRoleType().equals(ServiceUserTypeEnum.ADMIN.getId()); boolean isAdmin = user.getRoleType().equals(ServiceUserTypeEnum.ADMIN.getId());
String description = String.format(ServiceOrderStatusEnum.SEND.getMsg(), (isAdmin ? ServiceUserTypeEnum.ADMIN.getName() : ServiceUserTypeEnum.VALUATOR.getName()) + user.getUserName()); String description = String.format(ServiceOrderStatusEnum.SEND.getMsg(), (isAdmin ? ServiceUserTypeEnum.ADMIN.getName() : ServiceUserTypeEnum.VALUATOR.getName()) + user.getUserName());
recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.SEND.getStatus(), description, sourceEnum, null, null); recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.SEND.getStatus(), description, sourceEnum, null, null, null);
} }
return result; return result;
...@@ -209,7 +211,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> { ...@@ -209,7 +211,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
if (result == 1) { if (result == 1) {
String description = String.format(ServiceOrderStatusEnum.DISPATCH.getMsg(), user.getUserName(), serviceWorker.getName()); String description = String.format(ServiceOrderStatusEnum.DISPATCH.getMsg(), user.getUserName(), serviceWorker.getName());
recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.DISPATCH.getStatus(), description, sourceEnum, serviceWorker.getId(), dto.getRemark()); recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.DISPATCH.getStatus(), description, sourceEnum, serviceWorker.getId(), dto.getRemark(), null);
} }
return result; return result;
...@@ -245,7 +247,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> { ...@@ -245,7 +247,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
if (result == 1) { if (result == 1) {
String description = String.format(ServiceOrderStatusEnum.REDISPATCH.getMsg(), user.getUserName(), serviceWorker.getName()); String description = String.format(ServiceOrderStatusEnum.REDISPATCH.getMsg(), user.getUserName(), serviceWorker.getName());
recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.REDISPATCH.getStatus(), description, sourceEnum, serviceWorker.getId(), dto.getRemark()); recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.REDISPATCH.getStatus(), description, sourceEnum, serviceWorker.getId(), dto.getRemark(), null);
} }
return result; return result;
...@@ -280,7 +282,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> { ...@@ -280,7 +282,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
if (result == 1) { if (result == 1) {
String description = String.format(ServiceOrderStatusEnum.FINISH.getMsg(), isUser ? ServiceUserTypeEnum.USER.getName() : ServiceUserTypeEnum.ADMIN.getName() + user.getUserName()); String description = String.format(ServiceOrderStatusEnum.FINISH.getMsg(), isUser ? ServiceUserTypeEnum.USER.getName() : ServiceUserTypeEnum.ADMIN.getName() + user.getUserName());
recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.FINISH.getStatus(), description, sourceEnum, null, null); recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.FINISH.getStatus(), description, sourceEnum, null, null, null);
} }
return result; return result;
......
dao/src/main/java/com/onsiteservice/dao/component/RecordComponent.java
View file @ befc7fe1
...@@ -59,9 +59,9 @@ public class RecordComponent { ...@@ -59,9 +59,9 @@ public class RecordComponent {
@Async @Async
public void recordProcess(Long orderId, Integer processId, String description, ServiceOrderOpSourceEnum sourceEnum, Long hostId, String remark) { public void recordProcess(Long orderId, Integer processId, String description, ServiceOrderOpSourceEnum sourceEnum, Long hostId, String remark, Date expectArrivalTime) {
log.info("recordProcess orderId: {}, processId: {}, description: {}, sourceEnum: {}, hostId: {}, remark: {}", log.info("recordProcess orderId: {}, processId: {}, description: {}, sourceEnum: {}, hostId: {}, remark: {}, expectArrivalTime: {}",
orderId, processId, description, sourceEnum, hostId, remark); orderId, processId, description, sourceEnum, hostId, remark, expectArrivalTime);
ServiceOrderLog serviceOrderLog = new ServiceOrderLog(); ServiceOrderLog serviceOrderLog = new ServiceOrderLog();
serviceOrderLog.setOrderId(orderId); serviceOrderLog.setOrderId(orderId);
...@@ -70,6 +70,7 @@ public class RecordComponent { ...@@ -70,6 +70,7 @@ public class RecordComponent {
serviceOrderLog.setSource(sourceEnum.getId()); serviceOrderLog.setSource(sourceEnum.getId());
serviceOrderLog.setHostId(hostId); serviceOrderLog.setHostId(hostId);
serviceOrderLog.setRemark(remark); serviceOrderLog.setRemark(remark);
serviceOrderLog.setExpectArrivalTime(expectArrivalTime);
serviceOrderLogMapper.insertSelective(serviceOrderLog); serviceOrderLogMapper.insertSelective(serviceOrderLog);
} }
......
entity/src/main/java/com/onsiteservice/entity/service/ServiceOrderLog.java
View file @ befc7fe1
...@@ -69,5 +69,9 @@ public class ServiceOrderLog implements Serializable { ...@@ -69,5 +69,9 @@ public class ServiceOrderLog implements Serializable {
@ApiModelProperty("接口发生来源") @ApiModelProperty("接口发生来源")
private Integer source; private Integer source;
@Column(name = "expect_arrival_time")
@ApiModelProperty("估价员上门时间")
private Date expectArrivalTime;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }
\ No newline at end of file
mini-app/src/main/java/com/onsiteservice/miniapp/service/order/ServiceOrderBizService.java
View file @ befc7fe1
...@@ -166,7 +166,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> { ...@@ -166,7 +166,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
// 记录流程 // 记录流程
if (result == 1) { if (result == 1) {
recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.RESERVE.getStatus(), ServiceOrderStatusEnum.RESERVE.getMsg(), sourceEnum, null, null); recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.RESERVE.getStatus(), ServiceOrderStatusEnum.RESERVE.getMsg(), sourceEnum, null, null, null);
} }
return result; return result;
...@@ -190,7 +190,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> { ...@@ -190,7 +190,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
// TODO 调用微信支付接口 // TODO 调用微信支付接口
if (result == 1) { if (result == 1) {
recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.PAY.getStatus(), ServiceOrderStatusEnum.PAY.getMsg(), sourceEnum, null, null); recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.PAY.getStatus(), ServiceOrderStatusEnum.PAY.getMsg(), sourceEnum, null, null, null);
} }
return result; return result;
...@@ -213,7 +213,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> { ...@@ -213,7 +213,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
int result = serviceOrderMapper.updateByPrimaryKeySelective(serviceOrder); int result = serviceOrderMapper.updateByPrimaryKeySelective(serviceOrder);
if (result == 1) { if (result == 1) {
recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.CANCEL.getStatus(), ServiceOrderStatusEnum.CANCEL.getMsg(), sourceEnum, null, null); recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.CANCEL.getStatus(), ServiceOrderStatusEnum.CANCEL.getMsg(), sourceEnum, null, null, null);
} }
return result; return result;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment