fix: 修改用户类型接单时判断出错

guzijian
1 parent 9ad783f9
Showing 2 changed files with 10 additions and 10 deletions
trash-admin/pom.xml
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
@@ -49,7 +49,7 @@
             <artifactId>springfox-swagger-ui</artifactId>
         </dependency>
  
-         <!-- Mysql驱动包 -->
+        <!-- Mysql驱动包 -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
@@ -90,10 +90,10 @@
             <groupId>com.trash</groupId>
             <artifactId>trash-unit</artifactId>
         </dependency>
-       <!--  <dependency>
+        <dependency>
             <groupId>com.trash</groupId>
             <artifactId>trash-garbage</artifactId>
-        </dependency> -->
+        </dependency>
     </dependencies>
  
     <build>
@@ -113,15 +113,15 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>   
-                <groupId>org.apache.maven.plugins</groupId>   
-                <artifactId>maven-war-plugin</artifactId>   
-                <version>3.1.0</version>   
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.1.0</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <warName>${project.artifactId}</warName>
-                </configuration>   
-           </plugin>   
+                </configuration>
+            </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>
@@ -176,7 +176,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         String userId = SecurityUtils.getLoginUser().getUser().getUserId();
         GarUser user = garUserService.getById(userId);
         // 运输员操作 TODO 公司所属 待清运- 》 清运中
-        if (GlobalStatus.UserStatusEnum.NORMAL_USER.getDescription().equals(user.getGarUserType())){
+        if (GlobalStatus.UserStatusEnum.DRIVER_USER.getDescription().equals(user.getGarUserType())){
             if (order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue())
                     || GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(dto.getHandleType())) {
                 LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();