调整-11-26

lichao
1 parent 8b9a0980
Showing 1 changed file with 3 additions and 0 deletions
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
@@ -226,6 +226,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         GarOrderDriverVo orderVo = baseMapper.queryOrderByTelWithType(user.getGarUserTel(), orderId, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
         vo.setHandleFlag(true);
         BeanUtils.copyProperties(orderVo, vo);
+
         // 获取图片
         List<GarOrderImage> imageAll = new ArrayList<>();
  
@@ -668,6 +669,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 OrderDetailVo orderDetailVo = this.queryOrderDetail(dto.getGarOrderId());
                 //上传装车图片生成订单关联台账
  
+
                 for (int i = 0; i < order.getGarRealCarCount(); i++) {
                     //新增趟次关联台账
                     GarOrderMatchAsk garOrderMatchAsk = new GarOrderMatchAsk();
@@ -1508,6 +1510,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         // 查询当前运载几趟  如果全部运输完毕则发送成功短信
         LambdaQueryWrapper<GarOrderMatchAsk> qw = new LambdaQueryWrapper<>();
         qw.eq(GarOrderMatchAsk::getGarOrderId, dto.getGarOrderId());
+        qw.eq(GarOrderMatchAsk::getGarCarCode, dto.getGarHandlerCarCode());
         List<GarOrderMatchAsk> askList = askService.list(qw);
         GarOrder order = getById(orderId);
         for (GarOrderMatchAsk garOrderMatchAsk : askList) {