Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into test

performance-web/src/main/java/com/clx/performance/component/GoodsOrderTruckRecordComponent.java

@@ -69,6 +69,7 @@ public class GoodsOrderTruckRecordComponent {
 
     //释放车辆
     public void releaseDriverCard(String orderGoodsNo, String truckNo) {
+        log.info("执行释放车辆,货单号：{},车牌号：{}", orderGoodsNo, truckNo);
         orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoodsNo, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode(), truckNo);
         this.deleteTruckRecord(orderGoodsNo, truckNo);
     }

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java

@@ -71,7 +71,7 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     OrderGoodsVO findOrderGoodsById(Integer id);
 
-    List<OrderGoods> selectListByOrderGoodsList(List<String> orderNos);
+    List<OrderGoods> selectListByOrderGoodsList(List<String> orderGoodsNo);
 
     Integer updateOrderGoods(OrderGoodsEditParams orderGoodsEditParams);
 

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsTruckBindDao.java

@@ -47,4 +47,6 @@ public interface OrderGoodsTruckBindDao extends BaseDao<OrderGoodsTruckBindMappe
     void deleteByIds(List<Integer> ids);
 
     List<OrderGoodsTruckBind> selectCancelRecord(String orderGoodsNo, List<String> truckList);
+
+    List<OrderGoodsTruckBind> getCancelOrderGoods(String truckNo, String beginTime, String endTime);
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java

@@ -184,8 +184,8 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     }
 
     @Override
-    public List<OrderGoods> selectListByOrderGoodsList(List<String> orderNos) {
-        return baseMapper.selectList(lQrWrapper().in(OrderGoods::getOrderGoodsNo, orderNos));
+    public List<OrderGoods> selectListByOrderGoodsList(List<String> orderGoodsNo) {
+        return baseMapper.selectList(lQrWrapper().in(OrderGoods::getOrderGoodsNo, orderGoodsNo));
     }
 
     @Override

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsTruckBindDaoImpl.java

@@ -155,4 +155,12 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
                 .in(CollectionUtil.isNotEmpty(truckList), OrderGoodsTruckBind::getTruckNo, truckList)
         );
     }
+
+    @Override
+    public List<OrderGoodsTruckBind> getCancelOrderGoods(String truckNo, String beginTime, String endTime) {
+        return baseMapper.selectList(lQrWrapper().eq(OrderGoodsTruckBind::getOrderNo, truckNo)
+                .le(OrderGoodsTruckBind::getCreateTime, endTime)
+                .ge(OrderGoodsTruckBind::getCreateTime, beginTime)
+        );
+    }
 }

performance-web/src/main/java/com/clx/performance/service/OrderGoodsTruckBindService.java

 package com.clx.performance.service;
 
+import com.clx.performance.model.OrderGoods;
+
 import java.util.List;
 
 public interface OrderGoodsTruckBindService {
+
     List<Integer> getTrucksByOrderGoodsNo(String orderGoodsNo);
+
+    List<OrderGoods> getCancelOrderGoods(String truckNo, String beginTime, String endTime);
 }

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsTruckBindServiceImpl.java

 package com.clx.performance.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
+import com.clx.performance.model.OrderGoods;
+import com.clx.performance.model.OrderGoodsTruckBind;
 import com.clx.performance.service.OrderGoodsTruckBindService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
+@AllArgsConstructor
+@Slf4j
 public class OrderGoodsTruckBindServiceImpl implements OrderGoodsTruckBindService {
 
-    @Autowired
-    private OrderGoodsTruckBindDao orderGoodsTruckBindDao;
+
+    private final OrderGoodsTruckBindDao orderGoodsTruckBindDao;
+
+    private final OrderGoodsDao orderGoodsDao;
+
+
     @Override
     public List<Integer> getTrucksByOrderGoodsNo(String orderGoodsNo) {
         return orderGoodsTruckBindDao.getTrucksByOrderGoodsNo(orderGoodsNo);
     }
+
+    @Override
+    public List<OrderGoods> getCancelOrderGoods(String truckNo, String beginTime, String endTime) {
+        List<OrderGoodsTruckBind> list = orderGoodsTruckBindDao.getCancelOrderGoods(truckNo, beginTime, endTime);
+        if (CollectionUtil.isEmpty(list)) {
+            return null;
+        }
+        List<String> orderGoodsNoList = list.stream().map(OrderGoodsTruckBind::getOrderGoodsNo).collect(Collectors.toList());
+
+        return orderGoodsDao.selectListByOrderGoodsList(orderGoodsNoList);
+    }
+
+
 }