Merge branch 'master_chujiang_0805' into master_quotation

@@ -1141,17 +1141,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                 // 【第一阶段：生成草稿】
                 // 生成草稿要车单
                 CreateDraftRequestCarTicketVo createVo = packDraftRequestCarTicket(orderInfo, plan.getTomoPreShipDate(), quantity);
-                draftRequestCarTicketService.create(createVo);
-                // 发送消息提醒业务员补充数据
-                SysSiteMessageDto messageDto = new SysSiteMessageDto();
-                List<String> userIdList = new ArrayList<>();
-                userIdList.add(orderInfo.getContractCreateById());
-                messageDto.setUserIdList(userIdList);
-                messageDto.setTitle("草稿要车单补充通知");
-                messageDto.setContent("您有新的草稿要车单需要补充，请尽快完成！订单编号：" + orderInfo.getOrderNo());
-                messageDto.setBizKey(IdUtil.getId());
-                messageDto.setCreateUserId(null); // 系统自动发起
-                mqProducerService.createSysSiteMessage(messageDto);
+                draftRequestCarTicketService.createDraftAndNotify(createVo);
 
                 // 标记已生成新草稿
                 hasNewDraftCreated = true;

@@ -12,6 +12,7 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.common.utils.StringUtil;
+import com.lframework.starter.mq.core.service.MqProducerService;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
@@ -21,6 +22,7 @@ import com.lframework.starter.web.core.utils.OpLogUtil;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
 import com.lframework.starter.web.inner.entity.SysUser;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.sc.entity.DraftRequestCarTicket;
@@ -33,10 +35,12 @@ import com.lframework.xingyun.sc.vo.shipments.car.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -54,6 +58,8 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
     private SysUserService sysUserService;
     @Resource
     private ShipmentsPlanDetailService shipmentsPlanDetailService;
+    @Resource
+    private MqProducerService mqProducerService;
 
     @Override
     public PageResult<DraftRequestCarTicket> query(Integer pageIndex, Integer pageSize, QueryDraftRequestCarTicketVo vo) {
@@ -314,6 +320,30 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
         getBaseMapper().update(updateWrapper);
     }
 
+    /**
+     * 独立事务：生成草稿要车单并发送通知
+     * 使用 REQUIRES_NEW 确保即使外层事务回滚，这里的数据依然保留
+     */
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    public void createDraftAndNotify(CreateDraftRequestCarTicketVo vo) {
+        this.create(vo);
+        PurchaseOrderInfo info = purchaseOrderInfoService.findById(vo.getPurchaseOrderId());
+        if (info == null) {
+            return;
+        }
+
+        // 2. 发送消息提醒业务员补充数据
+        SysSiteMessageDto messageDto = new SysSiteMessageDto();
+        List<String> userIdList = new ArrayList<>();
+        userIdList.add(info.getContractCreateById());
+        messageDto.setUserIdList(userIdList);
+        messageDto.setTitle("草稿要车单补充通知");
+        messageDto.setContent("您有新的草稿要车单需要补充，请尽快完成！订单编号：" + info.getOrderNo());
+        messageDto.setBizKey(IdUtil.getId());
+        messageDto.setCreateUserId(null); // 系统自动发起
+        mqProducerService.createSysSiteMessage(messageDto);
+    }
+
     @Override
     public void cleanCacheByKey(Serializable key) {
 

@@ -84,4 +84,10 @@ public interface DraftRequestCarTicketService extends BaseMpService<DraftRequest
      * @param flag  标识符
      */
     void freezeOrDeblocking(Boolean flag, List<String> orderIds);
+
+    /**
+     * 不走事务
+     * @param vo
+     */
+    void createDraftAndNotify(CreateDraftRequestCarTicketVo vo);
 }