审批状态跟新调整

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

@@ -4033,6 +4033,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
         }
 
         if (Objects.nonNull(auditType)) {
+            // TODO 这里可能出现并行的审批任务，当结束一个审批任务变更为0时，需要同步查询当前正在进行的其他审批任务
             currentOrderDO.setAuditType(auditType);
 
             if (StringUtils.isNotBlank(auditResult)) {

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControl/OrderCargoControlServiceImpl.java

@@ -56,6 +56,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.servlet.ServletOutputStream;
@@ -560,7 +561,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
             }
         }
         orderApprovalMapper.updateById(orderApprovalDO);
-        orderService.updateStatus(orderApprovalDO.getOrderId(), "", null, null, null, null, orderApprovalDO.getType(), OrderApprovalTypeResultEnum.typeAndResultOf(orderApprovalDO.getType(), result).getDesc(), false);
+        orderService.updateStatus(orderApprovalDO.getOrderId(), "", null, null, null, null, 0, OrderApprovalTypeResultEnum.typeAndResultOf(orderApprovalDO.getType(), result).getDesc(), false);
         orderBusinessService.addOrderOperateLog(orderApprovalDO.getOrderId(), "订单操作", msg, list);
     }
 
@@ -594,6 +595,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void orderCargoControlApply(OrderCargoControlApplyVO orderCargoControlApplyVO) {
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
         Integer userType = loginUser != null ? loginUser.getUserType() : null;