调整兔灵erp物流同步回调接口

fs-admin/src/main/java/com/fs/his/controller/JstOrderSyncController.java

@@ -129,10 +129,7 @@ public class JstOrderSyncController {
         order.setRemark("卖家备注");
         order.setBuyerMessage("请发顺丰");
         order.setLabels("测试,同步");
-
-        order.setCreatorName("李四");
         order.setShopModified("2025-11-10T10:30:00Z");
-        order.setSendDate("2025-11-10T10:30:00Z");
         order.setLId("cs12345678912");
         order.setIsCod(false);
 
@@ -151,14 +148,16 @@ public class JstOrderSyncController {
         item.setShopSkuId("SHOP_SKU_001");
 //        item.setAmount(BigDecimal.valueOf(10000));      // 实付金额（分）
 //        item.setPrice(BigDecimal.valueOf(10000));       // 单价（分）
+//        item.setBasePrice(12000.0);   // 原价（分）
+
         item.setAmount(10000);      // 实付金额（分）
         item.setPrice(10000);       // 单价（分）
-//        item.setBasePrice(12000.0);   // 原价（分）
         item.setBasePrice(12000);   // 原价（分）
         item.setQty(1);
         item.setName("测试商品");
         item.setOuterOiId("OI_20251110_001");
         item.setProducedDate("2025-11-10T00:00:00Z");
+        item.setBatchId(null);
         return item;
     }
 

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

@@ -83,7 +83,7 @@ public class TlErpOrderServiceImpl implements TlErpOrderService {
                 log.error("聚水潭业务处理失败，status: {}, errmsg: {}", status, errmsg);
                 throw new RuntimeException("聚水潭同步订单失败: " + (errmsg != null ? errmsg : "未知错误"));
             }
-            log.info("订单同步到聚水潭成功！");
+            log.info("订单同步到聚水潭成功！{}",result);
             return response;
         } catch (Exception e) {
             throw new RuntimeException(e);

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

@@ -26,7 +26,7 @@ public class TlOrderConverter {
         item.setReceiverState(shopOrder.getReceiverState());
         item.setReceiverCity(shopOrder.getReceiverCity());
         item.setReceiverDistrict(shopOrder.getReceiverDistrict());
-        item.setReceiverTown(null); // 无对应字段
+        //item.setReceiverTown(null); // 无对应字段
         item.setReceiverZip(shopOrder.getReceiverZip());
         item.setReceiverAddress(shopOrder.getReceiverAddress());
         item.setReceiverName(shopOrder.getReceiverName());
@@ -51,7 +51,6 @@ public class TlOrderConverter {
 
         // 标签等
         item.setLabels(shopOrder.getLabels());
-        item.setQuestionDesc(null);
         item.setSellerFlag(0);
 
         // 嵌套对象
@@ -62,10 +61,10 @@ public class TlOrderConverter {
         item.setSendDate(shopOrder.getOrderDate());
 
         // 其他（无对应字段）
-        item.setNode(null);
-        item.setCreator(null);
-        item.setCreatorName(null);
-        item.setCart(null);
+//        item.setNode(null);
+//        item.setCreator(null);
+//        item.setCreatorName(null);
+//        item.setCart(null);
 
         return item;
     }
@@ -94,7 +93,6 @@ public class TlOrderConverter {
         detail.setQty(dto.getQty());
         detail.setName(dto.getName());
         detail.setOuterOiId(dto.getOuterOiId());
-        detail.setRemark(null);
         detail.setBatchId(dto.getBatchId());
         detail.setProducedDate(dto.getProducedDate());