Commit c645e844438ed04d7aa2eec392a57cd4ee12e432
1 parent
ae6c31ea
Changes
Showing
1 changed file
with
10 additions
and
3 deletions
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
| @@ -49,6 +49,8 @@ import org.springframework.web.util.HtmlUtils; | @@ -49,6 +49,8 @@ import org.springframework.web.util.HtmlUtils; | ||
| 49 | 49 | ||
| 50 | import javax.annotation.Resource; | 50 | import javax.annotation.Resource; |
| 51 | import java.text.SimpleDateFormat; | 51 | import java.text.SimpleDateFormat; |
| 52 | +import java.time.LocalTime; | ||
| 53 | +import java.time.format.DateTimeFormatter; | ||
| 52 | import java.util.*; | 54 | import java.util.*; |
| 53 | import java.util.concurrent.TimeUnit; | 55 | import java.util.concurrent.TimeUnit; |
| 54 | import java.util.stream.Collectors; | 56 | import java.util.stream.Collectors; |
| @@ -173,7 +175,6 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder> | @@ -173,7 +175,6 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder> | ||
| 173 | 175 | ||
| 174 | @Override | 176 | @Override |
| 175 | public OrderDetailVo queryOrderDetail(String id) { | 177 | public OrderDetailVo queryOrderDetail(String id) { |
| 176 | - | ||
| 177 | GarUser user = garUserService.getById(SecurityUtils.getLoginUser().getUser().getUserId()); | 178 | GarUser user = garUserService.getById(SecurityUtils.getLoginUser().getUser().getUserId()); |
| 178 | OrderDetailVo orderDetailVo = null; | 179 | OrderDetailVo orderDetailVo = null; |
| 179 | if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription()) | 180 | if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription()) |
| @@ -211,6 +212,7 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder> | @@ -211,6 +212,7 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder> | ||
| 211 | BeanUtils.copyProperties(orderVo, vo); | 212 | BeanUtils.copyProperties(orderVo, vo); |
| 212 | // 获取图片 | 213 | // 获取图片 |
| 213 | List<GarOrderImage> imageAll = new ArrayList<>(); | 214 | List<GarOrderImage> imageAll = new ArrayList<>(); |
| 215 | + | ||
| 214 | List<GarOrderImage> currentImageList = garOrderImageService.list(new LambdaQueryWrapper<GarOrderImage>() | 216 | List<GarOrderImage> currentImageList = garOrderImageService.list(new LambdaQueryWrapper<GarOrderImage>() |
| 215 | .eq(GarOrderImage::getGarOrderId, orderId) | 217 | .eq(GarOrderImage::getGarOrderId, orderId) |
| 216 | .eq(GarOrderImage::getGarOrderImageType, GlobalStatus.GarOrderStatus.IMAGE_TYPE_CURRENT.getValue())); | 218 | .eq(GarOrderImage::getGarOrderImageType, GlobalStatus.GarOrderStatus.IMAGE_TYPE_CURRENT.getValue())); |
| @@ -220,8 +222,11 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder> | @@ -220,8 +222,11 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder> | ||
| 220 | if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_CURRENT.getValue().equals(image.getGarOrderImageType())) { | 222 | if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_CURRENT.getValue().equals(image.getGarOrderImageType())) { |
| 221 | vo.getCurrentImages().add(image.getGarOrderImageUrl()); | 223 | vo.getCurrentImages().add(image.getGarOrderImageUrl()); |
| 222 | } | 224 | } |
| 225 | + | ||
| 223 | if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_ON.getValue().equals(image.getGarOrderImageType())) { | 226 | if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_ON.getValue().equals(image.getGarOrderImageType())) { |
| 224 | - vo.getPutOnImages().add(image.getGarOrderImageUrl()); | 227 | + SimpleDateFormat date = new SimpleDateFormat("HHmmss"); |
| 228 | + String imageDate = date.format(image.getGarCreateTime()); | ||
| 229 | + vo.getPutOnImages().add(image.getGarOrderImageUrl()+imageDate); | ||
| 225 | } | 230 | } |
| 226 | if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_DOWN.getValue().equals(image.getGarOrderImageType())) { | 231 | if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_DOWN.getValue().equals(image.getGarOrderImageType())) { |
| 227 | vo.getPutDownImages().add(image.getGarOrderImageUrl()); | 232 | vo.getPutDownImages().add(image.getGarOrderImageUrl()); |
| @@ -285,7 +290,9 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder> | @@ -285,7 +290,9 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder> | ||
| 285 | vo.getCurrentImages().add(image.getGarOrderImageUrl()); | 290 | vo.getCurrentImages().add(image.getGarOrderImageUrl()); |
| 286 | } | 291 | } |
| 287 | if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_ON.getValue().equals(image.getGarOrderImageType())) { | 292 | if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_ON.getValue().equals(image.getGarOrderImageType())) { |
| 288 | - vo.getPutOnImages().add(image.getGarOrderImageUrl()); | 293 | + SimpleDateFormat date = new SimpleDateFormat("HHmmss"); |
| 294 | + String imageDate = date.format(image.getGarCreateTime()); | ||
| 295 | + vo.getPutOnImages().add(image.getGarOrderImageUrl() + imageDate); | ||
| 289 | } | 296 | } |
| 290 | if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_DOWN.getValue().equals(image.getGarOrderImageType())) { | 297 | if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_DOWN.getValue().equals(image.getGarOrderImageType())) { |
| 291 | vo.getPutDownImages().add(image.getGarOrderImageUrl()); | 298 | vo.getPutDownImages().add(image.getGarOrderImageUrl()); |