Merge remote-tracking branch 'origin/master_feat_ysy_20250929' into master_feat_ysy_20250929

fs-service/src/main/java/com/fs/erp/dto/ShopOrderDTO.java

@@ -155,4 +155,14 @@ public class ShopOrderDTO implements Serializable {
      * 财务数据
      */
     private FinanceDataDTO financeData;
+
+    /**
+     * 销售id
+     */
+    private Long companyUserId;
+
+    /**
+     * 销售名称
+     */
+    private String companyUserName;
 }

fs-service/src/main/java/com/fs/erp/dto/tl/TlOrderItem.java

@@ -143,7 +143,7 @@ public class TlOrderItem {
 
     /** 业务员 ID */
     @JsonProperty("creator")
-    private Integer creator;
+    private Long creator;
 
     /** 业务员名称（必填） */
     @JsonProperty("creator_name")

fs-service/src/main/java/com/fs/erp/service/impl/JSTErpOrderServiceImpl.java

@@ -7,6 +7,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.fs.common.exception.CustomException;
+import com.fs.company.domain.CompanyUser;
+import com.fs.company.mapper.CompanyUserMapper;
 import com.fs.erp.constant.AfterSalesOrderStatusEnum;
 import com.fs.erp.constant.ErpQueryOrderStatusEnum;
 import com.fs.erp.constant.OrderStatusEnum;
@@ -95,6 +97,9 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
     @Autowired
     private FsStoreProductAttrValueMapper fsStoreProductAttrValueMapper;
 
+    @Autowired
+    private CompanyUserMapper companyUserMapper;
+
     @Override
     public ErpOrderResponse addOrder(ErpOrder order) {
         FsStoreOrder fsStoreOrder = fsStoreOrderService.selectFsStoreOrderByOrderCode(order.getPlatform_code());
@@ -226,6 +231,17 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
             }
         } else if (order.getErpType() == 2) {
             TlCreateOrderRequest request = new TlCreateOrderRequest();
+            //兔灵要求推送业务员名称
+            if (fsStoreOrder.getCompanyUserId()== null){
+                log.warn("业务员ID为空,订单id:{},订单编号:{}",fsStoreOrder.getOrderId(),fsStoreOrder.getOrderCode());
+            }else {
+                shopOrderDTO.setCompanyUserId(fsStoreOrder.getCompanyUserId());
+                CompanyUser companyUser = companyUserMapper.selectCompanyUserById(fsStoreOrder.getCompanyUserId());
+                if (companyUser != null){
+                    shopOrderDTO.setCompanyUserName(companyUser.getNickName());
+                }
+
+            }
             request.setData(Arrays.asList(toTlOrderItem(shopOrderDTO)));
             request.setCorpId("LwMAMdlBIH7agxn2t9N4Zv40");
             //兔灵的聚水潭服务器id

fs-service/src/main/java/com/fs/erp/utils/TlOrderConverter.java

@@ -63,11 +63,12 @@ public class TlOrderConverter {
 
         // 必填字段：发货日期（用订单日期代替，建议业务层传入正确值）
         item.setSendDate(convertLocalToUtcIso(shopOrder.getOrderDate()));
-
+        //销售id
+        item.setCreator(shopOrder.getCompanyUserId());
+        //销售名称
+        item.setCreatorName(shopOrder.getCompanyUserName());
         // 其他（无对应字段）
 //        item.setNode(null);
-//        item.setCreator(null);
-//        item.setCreatorName(null);
 //        item.setCart(null);
 
         return item;