feat: 估价员上门时间

common/src/main/java/com/onsiteservice/common/order/vo/ServiceOrderLogVO.java

@@ -25,4 +25,7 @@ public class ServiceOrderLogVO {
     @ApiModelProperty(value = "流程发生时间")
     private Date createTime;
 
+    @ApiModelProperty(value = "估价员上门时间")
+    private Date expectArrivalTime;
+
 }
\ No newline at end of file

common/src/main/java/com/onsiteservice/service/order/ServiceOrderService.java

@@ -94,7 +94,8 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
 
         if (result == 1) {
             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;
@@ -122,7 +123,8 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
 
         if (result == 1) {
             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;
@@ -170,7 +172,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
         if (result == 1) {
             boolean isAdmin = user.getRoleType().equals(ServiceUserTypeEnum.ADMIN.getId());
             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;
@@ -209,7 +211,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
 
         if (result == 1) {
             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;
@@ -245,7 +247,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
 
         if (result == 1) {
             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;
@@ -280,7 +282,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
 
         if (result == 1) {
             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;

dao/src/main/java/com/onsiteservice/dao/component/RecordComponent.java

@@ -59,9 +59,9 @@ public class RecordComponent {
 
 
     @Async
-    public void recordProcess(Long orderId, Integer processId, String description, ServiceOrderOpSourceEnum sourceEnum, Long hostId, String remark) {
-        log.info("recordProcess orderId: {}, processId: {}, description: {}, sourceEnum: {}, hostId: {}, remark: {}",
-                orderId, processId, description, sourceEnum, hostId, 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: {}, expectArrivalTime: {}",
+                orderId, processId, description, sourceEnum, hostId, remark, expectArrivalTime);
 
         ServiceOrderLog serviceOrderLog = new ServiceOrderLog();
         serviceOrderLog.setOrderId(orderId);
@@ -70,6 +70,7 @@ public class RecordComponent {
         serviceOrderLog.setSource(sourceEnum.getId());
         serviceOrderLog.setHostId(hostId);
         serviceOrderLog.setRemark(remark);
+        serviceOrderLog.setExpectArrivalTime(expectArrivalTime);
 
         serviceOrderLogMapper.insertSelective(serviceOrderLog);
     }

entity/src/main/java/com/onsiteservice/entity/service/ServiceOrderLog.java

@@ -69,5 +69,9 @@ public class ServiceOrderLog implements Serializable {
     @ApiModelProperty("接口发生来源")
     private Integer source;
 
+    @Column(name = "expect_arrival_time")
+    @ApiModelProperty("估价员上门时间")
+    private Date expectArrivalTime;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

mini-app/src/main/java/com/onsiteservice/miniapp/service/order/ServiceOrderBizService.java

@@ -166,7 +166,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
 
         // 记录流程
         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;
@@ -190,7 +190,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
         // TODO 调用微信支付接口
 
         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;
@@ -213,7 +213,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
         int result = serviceOrderMapper.updateByPrimaryKeySelective(serviceOrder);
 
         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;