fix: 公共估价接口修改

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

@@ -147,10 +147,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
         log.info("sendOrder dto: {}, userId: {}", dto, userId);
 
         // 判断发送者权限 只有客服和估价员可以发送订单
-        User user = userMapper.selectByPrimaryKey(userId);
-        if (Objects.isNull(user) || (!user.getRoleType().equals(ServiceUserTypeEnum.ADMIN.getId()) && !user.getRoleType().equals(ServiceUserTypeEnum.VALUATOR.getId()))) {
-            throw new ServiceException(BizCodeEnum.NO_AUTH_SEND_ORDER);
-        }
+        WorkUser user = checkAuth(userId, BizCodeEnum.NO_AUTH_SEND_ORDER, sourceEnum);
 
         // 判断能发送的状态: 估价可以发送,下单可以直接发送
         ServiceOrder serviceOrder = checkOrder(dto.getId(), null);
@@ -179,8 +176,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
         // TODO 小程序通知客户完成支付
 
         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());
+            String description = String.format(ServiceOrderStatusEnum.SEND.getMsg(), (user.getIsAdmin() ? ServiceUserTypeEnum.ADMIN.getName() : ServiceUserTypeEnum.VALUATOR.getName()) + user.getName());
             recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.SEND.getStatus(), description, sourceEnum, null, null, null);
         }
 
@@ -320,13 +316,13 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
             if (Objects.isNull(user) || !user.getRoleType().equals(ServiceUserTypeEnum.ADMIN.getId())) {
                 throw new ServiceException(biz);
             }
-            return new WorkUser(user.getId(), user.getUserName());
+            return new WorkUser(user.getId(), user.getUserName(), user.getRoleType().equals(ServiceUserTypeEnum.ADMIN.getId()));
         }
         SysUser sysUser = sysUserMapper.selectByPrimaryKey(userId);
         if (Objects.isNull(sysUser)) {
             throw new ServiceException(biz);
         }
-        return new WorkUser(sysUser.getId(), sysUser.getRealName());
+        return new WorkUser(sysUser.getId(), sysUser.getRealName(), true);
     }
 
 

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

@@ -10,4 +10,6 @@ import lombok.Data;
 public class WorkUser {
     private Long id;
     private String name;
+    // 是否是客服
+    private Boolean isAdmin;
 }