1、车辆运单拒绝接单/确认接单/撤回运单接口自测调整

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/KwtWaybillOrderController.java

@@ -126,7 +126,7 @@ public class KwtWaybillOrderController {
      **/
     @PostMapping("/confirmSendCar")
     public HttpResult confirmSendCar(@RequestBody @Valid ConfirmRefuseSendCarDto params){
-        return waybillOrderService.confirmSendCar(null);
+        return waybillOrderService.confirmSendCar(params);
     }
 
     /**

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

@@ -202,6 +202,7 @@ public class KwtWaybillOrderService {
                     SckwWaybillOrder mongoOrder = setSckwWaybillOrder(sendCarDto, waybillOrder, logisticsOrder, loadAddress,
                             unloadAddress, checkEnt, carrierEnt, goods);
                     mongoOrder.set_id(circulate.getId());
+                    mongoOrder.setWOrderNo(null);
                     sckwWaybillOrders.add(mongoOrder);
                 }
             }
@@ -262,12 +263,13 @@ public class KwtWaybillOrderService {
         //循环派车信息
         KwtLogisticsOrderCirculate circulate = logisticsOrderCirculateDao.findCirculate(waybillOrder.getLOrderId(),
                 waybillOrder.getTruckId(), waybillOrder.getDriverId(), 0);
-        if (circulate == null || circulate.getStatus() == Global.UN_READ) {
+        if (circulate == null) {
             circulate = new KwtLogisticsOrderCirculate();
             BeanUtils.copyProperties(waybillOrder, circulate);
             circulate.setWOrderId(null);
+            circulate.setStatus(0);
             int count = logisticsOrderCirculateDao.insert(circulate);
-            return count > 0 ? null : circulate;
+            return count > 0 ? circulate : null;
         }
         return circulate;
     }
@@ -301,12 +303,12 @@ public class KwtWaybillOrderService {
      * @author zk
      * @date 2023/7/20
      **/
-    public boolean setWaybillOrderTrack(Long wOrderId, int status) {
+    public KwtWaybillOrderTrack setWaybillOrderTrack(Long wOrderId, int status) {
         KwtWaybillOrderTrack orderTrack = new KwtWaybillOrderTrack();
         orderTrack.setWOrderId(wOrderId);
         orderTrack.setStatus(status);
         int count = waybillOrderTrackDao.insert(orderTrack);
-        return count > 0 ? true : false;
+        return count > 0 ? orderTrack : null;
     }
 
     /**
@@ -514,6 +516,7 @@ public class KwtWaybillOrderService {
      * @author zk
      * @date 2023/7/24
      **/
+    @Transactional(rollbackFor = Exception.class)
     public HttpResult cancelSendCar(List<Long> ids){
         /**数据校验**/
         if (CollectionUtils.isEmpty(ids)) {
@@ -609,8 +612,8 @@ public class KwtWaybillOrderService {
      * @author zk
      * @date 2023/7/25
      **/
+    @Transactional(rollbackFor = Exception.class)
     public HttpResult confirmSendCar(ConfirmRefuseSendCarDto params) {
-        /**趟次派车**/
         /**趟次派车**/
         if (params.getType() == Global.NUMERICAL_ONE) {
             /**数据校验**/
@@ -671,6 +674,7 @@ public class KwtWaybillOrderService {
             KwtWaybillOrder waybillOrder = new KwtWaybillOrder();
             waybillOrder.setEntId(LoginUserHolder.getEntId());
             waybillOrder.setLOrderId(params.getLOrderId());
+            waybillOrder.setWOrderNo("xxxxxx");
             waybillOrder.setType(params.getType());
             waybillOrder.setStartTime(circulate.getStartTime());
             waybillOrder.setEndTime(circulate.getEndTime());
@@ -686,6 +690,9 @@ public class KwtWaybillOrderService {
             /**业务处理**/
             /**1车辆运单存储**/
             ranksSave(waybillOrder, loadAddress, unloadAddress);
+            //补上车辆运单待接单状态
+            setWaybillOrderTrack(circulate, waybillOrder.getId());
+
 
             /**2更新承运订单信息**/
             //承运单信息
@@ -721,12 +728,32 @@ public class KwtWaybillOrderService {
         return HttpResult.ok("确认接单成功！");
     }
 
+    /**
+     * @param circulate 循环派车记录
+     * @param wOrderId 车辆订单ID
+     * @desc 新增循环派车接单后车辆运单待接单记录
+     * @author zk
+     * @date 2023/7/26
+     **/
+    public KwtWaybillOrderTrack setWaybillOrderTrack(KwtLogisticsOrderCirculate circulate, Long wOrderId) {
+        KwtWaybillOrderTrack orderTrack = new KwtWaybillOrderTrack();
+        orderTrack.setWOrderId(wOrderId);
+        orderTrack.setStatus(CarWaybillEnum.PENDING_ORDER.getCode());
+        orderTrack.setCreateBy(circulate.getCreateBy());
+        orderTrack.setCreateTime(circulate.getCreateTime());
+        orderTrack.setUpdateBy(circulate.getCreateBy());
+        orderTrack.setUpdateTime(circulate.getUpdateTime());
+        int count = waybillOrderTrackDao.insert(orderTrack);
+        return count > 0 ? orderTrack : null;
+    }
+
     /**
      * @param params {}
      * @description 拒绝接单
      * @author zk
      * @date 2023/7/25
      **/
+    @Transactional(rollbackFor = Exception.class)
     public HttpResult refuseSendCar(ConfirmRefuseSendCarDto params) {
         /**趟次派车**/
         if (params.getType() == Global.NUMERICAL_ONE) {