提交物流订单相关接口

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtLogisticsOrderCirculate.java

@@ -1,5 +1,7 @@
 package com.sckw.transport.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -21,6 +23,7 @@ public class KwtLogisticsOrderCirculate implements Serializable {
     /**
      * 主键
      */
+    @TableId(type = IdType.NONE)
     private Long id;
 
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/DeleteCapacityReq.java

@@ -2,10 +2,12 @@ package com.sckw.transport.model.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author :chenXiaoFei
@@ -20,16 +22,15 @@ public class DeleteCapacityReq implements Serializable {
     /**
      * 车辆id
      */
-    @NotBlank(message = "车辆id不能为空")
     @Schema(description = "车辆id")
     private String truckId;
 
     /**
      * 物流订单id
      */
-    @NotBlank(message = "物流订单id")
+    @NotNull(message = "物流订单id")
     @Schema(description = "物流订单id")
-    private String logisticsOrderId;
+    private List<String> logisticsOrderIds;
     /**
      * 派车状态（0-启用，1-关闭）
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtLogisticsOrderCirculateRepository.java

@@ -8,7 +8,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sckw.transport.dao.KwtLogisticsOrderCirculateMapper;
 import com.sckw.transport.model.KwtLogisticsOrderCirculate;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -28,17 +30,16 @@ public class KwtLogisticsOrderCirculateRepository extends ServiceImpl<KwtLogisti
                 .orderByDesc(KwtLogisticsOrderCirculate::getId));
     }
 
-    public KwtLogisticsOrderCirculate findOneByLogOrderIdAndTruckId(Long logOrderId, Long truckId) {
-        return getOne(Wrappers.<KwtLogisticsOrderCirculate>lambdaQuery().eq(KwtLogisticsOrderCirculate::getDelFlag,0)
-                .eq(KwtLogisticsOrderCirculate::getLOrderId, logOrderId)
+    public List<KwtLogisticsOrderCirculate> findOneByLogOrderIdsAndTruckId(List<Long> logOrderIds, Long truckId) {
+        return list(Wrappers.<KwtLogisticsOrderCirculate>lambdaQuery().eq(KwtLogisticsOrderCirculate::getDelFlag,0)
+                .in(KwtLogisticsOrderCirculate::getLOrderId, logOrderIds)
                 .eq(KwtLogisticsOrderCirculate::getTruckId, truckId)
-                .last("limit 1")
         );
     }
 
-    public Boolean updateCirculate(KwtLogisticsOrderCirculate updateCirCulate) {
-        return update(updateCirCulate,
-                Wrappers.<KwtLogisticsOrderCirculate>lambdaUpdate()
-                        .eq(KwtLogisticsOrderCirculate::getId, updateCirCulate.getId()));
+    @Transactional
+    public Boolean updateCirculates(List<KwtLogisticsOrderCirculate> updateCirculates) {
+        return updateBatchById(updateCirculates);
+
     }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtLogisticsConsignmentService.java

@@ -2747,17 +2747,27 @@ public class KwtLogisticsConsignmentService {
     }
 
 
+    @Transactional(rollbackFor = Exception.class)
     public Boolean closeCapacity(@Valid DeleteCapacityReq req) {
         log.info("关闭启用已派运力请求参数：{}", JSON.toJSONString(req));
-        KwtLogisticsOrderCirculate logisticsOrderCirculate =
-                logisticsOrderCirculateRepository.findOneByLogOrderIdAndTruckId(Long.parseLong(req.getLogisticsOrderId()),
+        List<Long> logisticsOrderIds = req.getLogisticsOrderIds()
+                .stream().map(x -> Long.parseLong(x)).collect(Collectors.toList());
+        List<KwtLogisticsOrderCirculate> logisticsOrderCirculate =
+                logisticsOrderCirculateRepository.findOneByLogOrderIdsAndTruckId(logisticsOrderIds,
                         Long.parseLong(req.getTruckId()));
         if (Objects.isNull(logisticsOrderCirculate)) {
             throw new BusinessException("未找到该运力信息");
         }
-        KwtLogisticsOrderCirculate updateCirCulate = new KwtLogisticsOrderCirculate();
-        updateCirCulate.setId(logisticsOrderCirculate.getId());
-        updateCirCulate.setStatus(Integer.parseInt(req.getStatus()));
-        return logisticsOrderCirculateRepository.updateCirculate(updateCirCulate);
+        List<KwtLogisticsOrderCirculate> orderCirculates = logisticsOrderCirculate.stream()
+                .map(x -> {
+            KwtLogisticsOrderCirculate updateCirCulate = new KwtLogisticsOrderCirculate();
+            updateCirCulate.setId(x.getId());
+            updateCirCulate.setStatus(Integer.parseInt(req.getStatus()));
+            updateCirCulate.setUpdateTime(new Date());
+            updateCirCulate.setUpdateBy(LoginUserHolder.getUserId());
+            return updateCirCulate;
+        }).collect(Collectors.toList());
+
+        return logisticsOrderCirculateRepository.updateCirculates(orderCirculates);
     }
 }