修改BUG

performance-api/src/main/java/com/clx/performance/enums/OrderGoodsTruckBindEnum.java

@@ -4,9 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.Arrays;
-import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
 
 public enum OrderGoodsTruckBindEnum {
     ;
@@ -15,11 +13,12 @@ public enum OrderGoodsTruckBindEnum {
     @AllArgsConstructor
     public enum Status {
 
-        SUCCESS(1, "正常"),
+        NORMAL(1, "正常"),
 
         CANCEL(2, "取消"),
         GET(3, "已接单"),
-        EXPIRE(4, "已失效")
+        EXPIRE(4, "已失效"),
+        SUCCESS(5, "结束")
 
         ;
 

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

@@ -3,6 +3,8 @@ package com.clx.performance.component;
 import cn.hutool.core.util.StrUtil;
 import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.dao.OrderGoodsDriverTruckDao;
+import com.clx.performance.dao.OrderGoodsTruckBindDao;
+import com.clx.performance.enums.OrderGoodsTruckBindEnum;
 import com.clx.performance.model.OrderGoodsDriverTruck;
 import com.msl.common.base.Optional;
 import lombok.AllArgsConstructor;
@@ -23,6 +25,8 @@ public class GoodsOrderTruckRecordComponent {
 
     private final OrderGoodsDriverTruckDao orderGoodsDriverTruckDao;
 
+    private final OrderGoodsTruckBindDao orderGoodsTruckBindDao;
+
 
     public void saveTruckRecord(String orderGoodsNo, List<String> truckList) {
         redisTemplate.opsForSet().add(RedisConstants.ORDER_GOODS_TRUCK_RECORD + orderGoodsNo, truckList.toArray(new String[]{}));
@@ -62,4 +66,10 @@ public class GoodsOrderTruckRecordComponent {
         return truckList;
 
     }
+
+    //释放车辆
+    public void releaseDriverCard(String orderGoodsNo, String truckNo) {
+        orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoodsNo, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode(), truckNo);
+        this.deleteTruckRecord(orderGoodsNo, truckNo);
+    }
 }

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

@@ -33,6 +33,7 @@ public interface OrderGoodsTruckBindDao extends BaseDao<OrderGoodsTruckBindMappe
 
     void updateOrderGoodsBindStatus(String orderGoodsNo, Integer code, List<String> truckList);
 
+    void updateOrderGoodsBindStatus(String orderGoodsNo, Integer code, String truckNo);
 
     List<OrderGoodsTruckBind> selectListByOrderGoodsNo(String orderGoodsNo);
 

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

@@ -74,7 +74,7 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
     @Override
     public Optional<List<OrderGoodsTruckBind>> selectListByTruckNo(List<String> truckList) {
         return Optional.ofNullable(baseMapper.selectList(new QueryWrapper<OrderGoodsTruckBind>().lambda()
-                        .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
+                        .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.NORMAL.getCode())
                 .in(OrderGoodsTruckBind::getTruckNo,truckList).select(OrderGoodsTruckBind::getOrderGoodsNo)));
     }
 
@@ -95,10 +95,19 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
         );
     }
 
+    @Override
+    public void updateOrderGoodsBindStatus(String orderGoodsNo, Integer code, String truckNo) {
+        update(lUdWrapper()
+                .set(OrderGoodsTruckBind::getStatus, code)
+                .eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
+                .eq(OrderGoodsTruckBind::getTruckNo, truckNo)
+        );
+    }
+
     @Override
     public List<OrderGoodsTruckBind> selectListByOrderGoodsNo(String orderGoodsNo) {
         return baseMapper.selectList(lQrWrapper().eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
-                .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
+                .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.NORMAL.getCode())
                 .or()
                 .eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
                 .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.GET.getCode())
@@ -109,7 +118,7 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
     public void updateOrderGoodsBindStatusExpire(String orderGoodsNo) {
         update(lUdWrapper()
                 .eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
-                .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
+                .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.NORMAL.getCode())
                 .set(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.EXPIRE.getCode())
         );
     }
@@ -122,7 +131,7 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
         if(StringUtils.isNotBlank(truckNo)){
             query.eq(OrderGoodsTruckBind::getTruckNo, truckNo);
         }
-        query.in(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode(),OrderGoodsTruckBindEnum.Status.GET.getCode());
+        query.in(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.NORMAL.getCode(),OrderGoodsTruckBindEnum.Status.GET.getCode());
         query.orderByDesc(OrderGoodsTruckBind :: getCreateTime);
         return baseMapper.selectList(query);
     }
@@ -131,7 +140,7 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
     public List<OrderGoodsTruckBind> judgeTruckIsBindDxOrder(Set<String> set) {
         LambdaQueryWrapper<OrderGoodsTruckBind> query = new LambdaQueryWrapper<>();
         query.in(OrderGoodsTruckBind::getTruckNo, set);
-        query.in(OrderGoodsTruckBind :: getStatus,OrderGoodsTruckBindEnum.Status.SUCCESS.getCode(),OrderGoodsTruckBindEnum.Status.GET.getCode());
+        query.in(OrderGoodsTruckBind :: getStatus,OrderGoodsTruckBindEnum.Status.NORMAL.getCode(),OrderGoodsTruckBindEnum.Status.GET.getCode());
         return baseMapper.selectList(query);
     }
 

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

@@ -788,6 +788,9 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         // 更新出车状态
         updateDriverOrderStatusUnload(orderChild.getDriverUserNo(), orderChild.getTruckId());
+
+        //释放车辆
+        goodsOrderTruckRecordComponent.releaseDriverCard(orderChild.getOrderGoodsNo(), orderChild.getTruckNo());
     }
 
     private void updateReUnload(OrderChildUnloadParam param, OrderChild orderChild) {

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsTruckBindSqlProvider.java

 package com.clx.performance.sqlProvider;
 
+import com.clx.performance.enums.OrderGoodsTruckBindEnum;
 import com.clx.performance.model.OrderGoodsTruckBind;
 
 import java.time.LocalDateTime;
@@ -14,7 +15,7 @@ public class OrderGoodsTruckBindSqlProvider {
         for (int i = 0; i < trackList.size(); i++) {
             String truckNo = trackList.get(i);
             sqlList.append(" ('").append(orderNo).append("','").append(orderGoodsNo).append("','").append(truckNo).append("','")
-                    .append(now).append("','").append(now).append("','").append(OrderGoodsTruckBind.Status.NORMAL.getCode())
+                    .append(now).append("','").append(now).append("','").append(OrderGoodsTruckBindEnum.Status.NORMAL.getCode())
                     .append("')");
             if (i < trackList.size() - 1) {
                 sqlList.append(",");