Commit a0864d74ef6c625d182f92fb9be79f912b4c9c43

Authored by guzijian
1 parent 9ad783f9

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

trash-admin/pom.xml
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <artifactId>springfox-swagger-ui</artifactId> 49 <artifactId>springfox-swagger-ui</artifactId>
50 </dependency> 50 </dependency>
51 51
52 - <!-- Mysql驱动包 --> 52 + <!-- Mysql驱动包 -->
53 <dependency> 53 <dependency>
54 <groupId>mysql</groupId> 54 <groupId>mysql</groupId>
55 <artifactId>mysql-connector-java</artifactId> 55 <artifactId>mysql-connector-java</artifactId>
@@ -90,10 +90,10 @@ @@ -90,10 +90,10 @@
90 <groupId>com.trash</groupId> 90 <groupId>com.trash</groupId>
91 <artifactId>trash-unit</artifactId> 91 <artifactId>trash-unit</artifactId>
92 </dependency> 92 </dependency>
93 - <!-- <dependency> 93 + <dependency>
94 <groupId>com.trash</groupId> 94 <groupId>com.trash</groupId>
95 <artifactId>trash-garbage</artifactId> 95 <artifactId>trash-garbage</artifactId>
96 - </dependency> --> 96 + </dependency>
97 </dependencies> 97 </dependencies>
98 98
99 <build> 99 <build>
@@ -113,15 +113,15 @@ @@ -113,15 +113,15 @@
113 </execution> 113 </execution>
114 </executions> 114 </executions>
115 </plugin> 115 </plugin>
116 - <plugin>  
117 - <groupId>org.apache.maven.plugins</groupId>  
118 - <artifactId>maven-war-plugin</artifactId>  
119 - <version>3.1.0</version> 116 + <plugin>
  117 + <groupId>org.apache.maven.plugins</groupId>
  118 + <artifactId>maven-war-plugin</artifactId>
  119 + <version>3.1.0</version>
120 <configuration> 120 <configuration>
121 <failOnMissingWebXml>false</failOnMissingWebXml> 121 <failOnMissingWebXml>false</failOnMissingWebXml>
122 <warName>${project.artifactId}</warName> 122 <warName>${project.artifactId}</warName>
123 - </configuration>  
124 - </plugin> 123 + </configuration>
  124 + </plugin>
125 </plugins> 125 </plugins>
126 <finalName>${project.artifactId}</finalName> 126 <finalName>${project.artifactId}</finalName>
127 </build> 127 </build>
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
@@ -176,7 +176,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt; @@ -176,7 +176,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
176 String userId = SecurityUtils.getLoginUser().getUser().getUserId(); 176 String userId = SecurityUtils.getLoginUser().getUser().getUserId();
177 GarUser user = garUserService.getById(userId); 177 GarUser user = garUserService.getById(userId);
178 // 运输员操作 TODO 公司所属 待清运- 》 清运中 178 // 运输员操作 TODO 公司所属 待清运- 》 清运中
179 - if (GlobalStatus.UserStatusEnum.NORMAL_USER.getDescription().equals(user.getGarUserType())){ 179 + if (GlobalStatus.UserStatusEnum.DRIVER_USER.getDescription().equals(user.getGarUserType())){
180 if (order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue()) 180 if (order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue())
181 || GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(dto.getHandleType())) { 181 || GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(dto.getHandleType())) {
182 LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>(); 182 LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();