From 1fedb75e06885872a8db784efc57ca45f0ce2673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=AE=87=E5=A5=87?= <liangyuqi@bdfint.com>
Date: Thu, 14 Aug 2025 19:11:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xkt/dto/express/ExpressShipReqDTO.java    | 28 +++++++++++++++++--
 .../manager/impl/YtoExpressManagerImpl.java   |  2 +-
 .../manager/impl/ZtoExpressManagerImpl.java   |  2 +-
 .../service/impl/StoreOrderServiceImpl.java   |  5 +++-
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/express/ExpressShipReqDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/express/ExpressShipReqDTO.java
index c4b1c954c..39572644e 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/dto/express/ExpressShipReqDTO.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/dto/express/ExpressShipReqDTO.java
@@ -80,12 +80,28 @@ public class ExpressShipReqDTO {
      * 物品信息
      */
     private List<OrderItem> orderItems;
+    /**
+     * 备注
+     */
+    private String remark;
 
     @Data
     @Builder
     @AllArgsConstructor
     @NoArgsConstructor
     public static class OrderItem {
+        /**
+         * 商品货号
+         */
+        private String prodArtNum;
+        /**
+         * 颜色名称
+         */
+        private String colorName;
+        /**
+         * 商品尺码
+         */
+        private Integer prodSize;
         /**
          * 货品名称
          */
@@ -124,9 +140,15 @@ public class ExpressShipReqDTO {
         if (CollUtil.isEmpty(orderItems)) {
             return null;
         }
-        List<String> list = new ArrayList<>(orderItems.size());
-        for (OrderItem item : orderItems) {
-            list.add(StrUtil.emptyIfNull(item.getName()) + "*" + item.getQuantity());
+        List<String> list = new ArrayList<>(2);
+        for (int i = 0; i < orderItems.size(); i++) {
+            if (i > 1) {
+                list.add("...");
+                break;
+            }
+            OrderItem item = orderItems.get(i);
+            list.add(StrUtil.emptyIfNull(item.getProdArtNum()) + " " + item.getColorName() + " " + item.getProdSize() +
+                    "*" + item.getQuantity());
         }
         return StrUtil.join(";", list);
     }
diff --git a/xkt/src/main/java/com/ruoyi/xkt/manager/impl/YtoExpressManagerImpl.java b/xkt/src/main/java/com/ruoyi/xkt/manager/impl/YtoExpressManagerImpl.java
index cba362dbb..5250d3c43 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/manager/impl/YtoExpressManagerImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/manager/impl/YtoExpressManagerImpl.java
@@ -88,7 +88,7 @@ public class YtoExpressManagerImpl implements ExpressManager {
                 rtn.setLastPrintTime(new Date());
                 rtn.setPrintCount(1);
                 rtn.setGoodsInfo(shipReqDTO.getGoodsSummary());
-                rtn.setRemark(rtn.getGoodsInfo());
+                rtn.setRemark(shipReqDTO.getRemark());
                 return rtn;
             }
         } catch (Exception e) {
diff --git a/xkt/src/main/java/com/ruoyi/xkt/manager/impl/ZtoExpressManagerImpl.java b/xkt/src/main/java/com/ruoyi/xkt/manager/impl/ZtoExpressManagerImpl.java
index 139c620b9..1fedcf3f3 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/manager/impl/ZtoExpressManagerImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/manager/impl/ZtoExpressManagerImpl.java
@@ -108,7 +108,7 @@ public class ZtoExpressManagerImpl implements ExpressManager, InitializingBean {
                     rtn.setLastPrintTime(new Date());
                     rtn.setPrintCount(1);
                     rtn.setGoodsInfo(shipReqDTO.getGoodsSummary());
-                    rtn.setRemark(rtn.getGoodsInfo());
+                    rtn.setRemark(shipReqDTO.getRemark());
                     return rtn;
                 }
             }
diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java
index acb79b8c1..b7bd65b63 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java
@@ -1893,11 +1893,14 @@ public class StoreOrderServiceImpl implements IStoreOrderService {
         reqDTO.setOriginProvinceName(regionMap.get(order.getOriginProvinceCode()));
         reqDTO.setOriginCityName(regionMap.get(order.getOriginCityCode()));
         reqDTO.setOriginCountyName(regionMap.get(order.getOriginCountyCode()));
+        reqDTO.setRemark(order.getOrderRemark());
         //货物信息
         List<ExpressShipReqDTO.OrderItem> orderItems = CollUtil.emptyIfNull(orderDetails).stream()
                 .map(o -> ExpressShipReqDTO.OrderItem
                         .builder()
-                        //TODO 其他信息？
+                        .prodArtNum(o.getProdArtNum())
+                        .colorName(o.getColorName())
+                        .prodSize(o.getSize())
                         .name(o.getProdTitle())
                         .quantity(o.getGoodsQuantity())
                         .build())