增加货单无货，提取释放定向单

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

@@ -29,4 +29,8 @@ public interface OrderGoodsTruckBindDao extends BaseDao<OrderGoodsTruckBindMappe
     Optional<List<OrderGoodsTruckBind>> selectListByTruckNo(List<String> truckList);
 
     void updateOrderGoodsBindStatus(String orderGoodsNo, Integer code);
+
+    List<OrderGoodsTruckBind> selectListByOrderGoodsNo(String orderGoodsNo);
+
+    void updateOrderGoodsBindStatusExpire(String orderGoodsNo);
 }

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

@@ -81,4 +81,20 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
                 .set(OrderGoodsTruckBind::getStatus, code)
         );
     }
+
+    @Override
+    public List<OrderGoodsTruckBind> selectListByOrderGoodsNo(String orderGoodsNo) {
+        return baseMapper.selectList(lQrWrapper().eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
+                .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
+        );
+    }
+
+    @Override
+    public void updateOrderGoodsBindStatusExpire(String orderGoodsNo) {
+        update(lUdWrapper()
+                .eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
+                .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
+                .set(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.EXPIRE.getCode())
+        );
+    }
 }

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

@@ -79,7 +79,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
         orderGoodsVO.setReveiveAddressAll(orderInfoFeign.getReveiveAddressAll());
         orderGoodsVO.setSendAddressAll(orderInfoFeign.getSendAddressAll());
-        orderGoodsVO.setResidueTransportWeight(BigDecimal.ZERO.compareTo(orderGoodsVO.getResidueTransportWeight()) > 0?BigDecimal.ZERO:orderGoodsVO.getResidueTransportWeight());
+        orderGoodsVO.setResidueTransportWeight(BigDecimal.ZERO.compareTo(orderGoodsVO.getResidueTransportWeight()) > 0 ? BigDecimal.ZERO : orderGoodsVO.getResidueTransportWeight());
         return orderGoodsVO;
     }
 
@@ -96,7 +96,9 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     @Override
     public void updateOrderGoodsReduceWeightAndStatus(OrderGoods orderGoods, BigDecimal orderChildWeight, Integer orderGoodsStatus) {
         orderGoodsDao.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), orderChildWeight, orderGoodsStatus);
-
+        if (orderGoods.getResidueTransportWeight().compareTo(orderChildWeight) <= 0) {
+            orderGoodsTruckBindDao.updateOrderGoodsBindStatusExpire(orderGoods.getOrderGoodsNo());
+        }
 
     }
 
@@ -113,23 +115,23 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
             //查询当前用户是否是货主
             Long driverUserNo = orderGoodsListParam.getDriverUserNo();
             Result<List<String>> ownTruckByUserNo = userClxFeign.getOwnTruckByUserNo(driverUserNo);
-            log.info("通过用户编号:{} 查询本人车辆，查询结果:{}",driverUserNo, JSON.toJSONString(ownTruckByUserNo));
-            if (Objects.equals(ownTruckByUserNo.getCode(),ResultCodeEnum.SUCCESS.getCode())) {
+            log.info("通过用户编号:{} 查询本人车辆，查询结果:{}", driverUserNo, JSON.toJSONString(ownTruckByUserNo));
+            if (Objects.equals(ownTruckByUserNo.getCode(), ResultCodeEnum.SUCCESS.getCode())) {
                 if ((!truckList.isPresent() || CollectionUtils.isEmpty(truckList.get())) && ownTruckByUserNo.getData().isEmpty()) {
-                    log.warn("用户编号:{},当前用户未绑定车辆",driverUserNo);
+                    log.warn("用户编号:{},当前用户未绑定车辆", driverUserNo);
                     return new Page<>();
                 }
                 truckNoList.addAll(ownTruckByUserNo.getData());//当前用户自己的车
                 truckNoList.addAll(truckList.get().stream().map(OrderGoodsDriverTruck::getTruckNo).collect(Collectors.toList()));//当前用户被绑定为司机的车
             }
-            if(CollectionUtils.isEmpty(truckNoList)){
-                log.warn("用户编号:{},查询车主车辆和作为司机的车辆全未查询到数据",driverUserNo);
+            if (CollectionUtils.isEmpty(truckNoList)) {
+                log.warn("用户编号:{},查询车主车辆和作为司机的车辆全未查询到数据", driverUserNo);
                 return new Page<>();
             }
             Optional<List<OrderGoodsTruckBind>> orderGoodsDriverTrucks = orderGoodsTruckBindDao.selectListByTruckNo(
                     truckNoList);
             if (!orderGoodsDriverTrucks.isPresent() || orderGoodsDriverTrucks.get().isEmpty()) {
-                log.warn("用户编号:{},无专属单",driverUserNo);
+                log.warn("用户编号:{},无专属单", driverUserNo);
                 return new Page<>();
             }