|
@@ -1022,21 +1022,53 @@ public class OrderClothServiceImpl extends ServiceImpl<OrderClothMapper, OrderCl
|
|
|
if (!SourceType.MANAGER.getCode().equals(SecurityUtils.getLoginUser().getSourceType())) {
|
|
|
orderAppointmentDTO2.setOrgId(SecurityUtils.getLoginUser().getOrgId());
|
|
|
}
|
|
|
- /** 预约状态(1=待接单,2=待上门,3=已取物,4=待配送,5=配送中,9=已完成,100=已取消) */
|
|
|
- if (ClothAppointmentStatus.APPOINTMENT.getCode().equals(orderAppointmentDTO2.getAppointmentStatus()) ||
|
|
|
- ClothAppointmentStatus.WAITING_TO_DOOR.getCode().equals(orderAppointmentDTO2.getAppointmentStatus()) ||
|
|
|
- ClothAppointmentStatus.HAS_TAKING.getCode().equals(orderAppointmentDTO2.getAppointmentStatus())
|
|
|
- ) {
|
|
|
- orderAppointmentDTO2.setTakeClothWay(TakeOrSendClothWay.DELIVERY.getCode());
|
|
|
+ Integer[] orderStatus = new Integer[]{0};
|
|
|
+ // 虚拟定单状态 1:待接单 2:取衣中 3:待支付 4:待入厂 5:清洗中 6:待上挂 7:待送衣 8:送衣中 99:已完成 100:已取消
|
|
|
+ switch (orderAppointmentDTO2.getVirtualListStatus()) {
|
|
|
+ case 1:
|
|
|
+ // 待接单
|
|
|
+ orderStatus = new Integer[]{0};
|
|
|
+ break;
|
|
|
+ case 2:
|
|
|
+ // 取衣中
|
|
|
+ orderStatus = new Integer[]{1,2,3};
|
|
|
+ break;
|
|
|
+ case 3:
|
|
|
+ // 待支付
|
|
|
+ orderStatus = new Integer[]{4};
|
|
|
+ break;
|
|
|
+ case 4:
|
|
|
+ // 待入厂
|
|
|
+ orderStatus = new Integer[]{5};
|
|
|
+ break;
|
|
|
+ case 5:
|
|
|
+ // 清洗中
|
|
|
+ orderStatus = new Integer[]{6};
|
|
|
+ break;
|
|
|
+ case 6:
|
|
|
+ // 待上挂
|
|
|
+ orderStatus = new Integer[]{};
|
|
|
+ break;
|
|
|
+ case 7:
|
|
|
+ // 待送衣
|
|
|
+ orderStatus = new Integer[]{8};
|
|
|
+ break;
|
|
|
+ case 8:
|
|
|
+ // 送衣中
|
|
|
+ orderStatus = new Integer[]{9};
|
|
|
+ break;
|
|
|
+ case 99:
|
|
|
+ // 已完成
|
|
|
+ orderStatus = new Integer[]{10,11};
|
|
|
+ break;
|
|
|
+ case 100:
|
|
|
+ orderStatus = new Integer[]{100};
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ orderStatus = new Integer[]{0};
|
|
|
+ break;
|
|
|
}
|
|
|
-
|
|
|
- if (ClothAppointmentStatus.WAITING_TO_SEND.getCode().equals(orderAppointmentDTO2.getAppointmentStatus()) ||
|
|
|
- ClothAppointmentStatus.SENDING.getCode().equals(orderAppointmentDTO2.getAppointmentStatus()) ||
|
|
|
- ClothAppointmentStatus.FINISH.getCode().equals(orderAppointmentDTO2.getAppointmentStatus())
|
|
|
- ) {
|
|
|
- orderAppointmentDTO2.setSendClothWay(TakeOrSendClothWay.DELIVERY.getCode());
|
|
|
- }
|
|
|
-
|
|
|
+ orderAppointmentDTO2.setQueryOrderStatus(Arrays.asList(orderStatus));
|
|
|
List<OrderClothAppointmentVO> orderClothAppointmentVOList = baseMapper.getAppointmentClothOrderList(orderAppointmentDTO2);
|
|
|
for (OrderClothAppointmentVO orderClothAppointmentVO : orderClothAppointmentVOList) {
|
|
|
orderClothAppointmentVO.setOrderClothAddress(orderClothAddressService.getByorderSn(orderClothAppointmentVO.getOrderNo()));
|