fix 订单标题过长的问题

mall-common/src/main/java/com/suisung/mall/common/modules/order/dto/MchOrderInfoDTO.java

@@ -68,6 +68,10 @@ public class MchOrderInfoDTO implements Serializable {
     private Integer currency_id;
     @ApiModelProperty(value = "订单状态(LIST):2011-待订单审核;2013-待财务审核;2020-待配货/待出库审核;2030-待发货;2040-已发货/待收货确认;2060-已完成/已签收;2070-已取消/已作废;")
     private Integer order_state_id;
+    @ApiModelProperty(value = "确认收货状态")
+    private Integer order_is_received;
+    @ApiModelProperty(value = "订单种类(ENUM): 1201-实物 ; 1202-虚拟  ; 1203-电子卡券  ; 1204-外卖订单")
+    private Integer kind_id;
     @ApiModelProperty(value = "配送方式: 1-快递配送（运费 10 元）5-自提；10-普通快递；16-顺丰同城；")
     private Integer delivery_type_id;
     @ApiModelProperty(value = "订单运费")

mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java

@@ -2624,6 +2624,7 @@ public class LakalaApiServiceImpl implements LakalaApiService {
                 shippingFeeReceiver.setRecvNo(agent2ndReceiver.getReceiver_no());
                 shippingFeeReceiver.setSeparateValue(Convert.toStr(shoppingFeeInner));
                 recvDatas.add(shippingFeeReceiver);
+                log.debug("[分账操作] 配送费由县级代理商接收方代收: receiverNo={}, amount={}", agent2ndReceiver.getReceiver_no(), shoppingFeeInner);
 
             } else {
                 // 没有县级代理商的时候，配送费暂由平台代收 add 2025-10-11
@@ -2631,6 +2632,7 @@ public class LakalaApiServiceImpl implements LakalaApiService {
                 shippingFeeReceiver.setRecvNo(platformReceiver.getReceiver_no());
                 shippingFeeReceiver.setSeparateValue(Convert.toStr(shoppingFeeInner));
                 recvDatas.add(shippingFeeReceiver);
+                log.debug("[分账操作] 配送费由平台接收方代收: receiverNo={}, amount={}", platformReceiver.getReceiver_no(), shoppingFeeInner);
             }
 
             // 初始化拉卡拉SDK

mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java

@@ -6529,8 +6529,9 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
                     if (CollUtil.isNotEmpty(item_items)) {
                         String firstProductName = Convert.toStr(item_items.get(0).get("product_item_name"));
                         if (StrUtil.isNotBlank(firstProductName)) {
+                            firstProductName = StrUtil.trim(firstProductName);
                             // 限制长度，防止超出字段限制
-                            if (firstProductName.length() > 100) {
+                            if (StrUtil.length(firstProductName) > 100) {
                                 firstProductName = firstProductName.substring(0, 100);
                             }
                             product_item_name = firstProductName + "等商品";

mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml

@@ -586,6 +586,8 @@
         <result property="order_picked_time" column="order_picked_time"/>
         <result property="currency_id" column="currency_id"/>
         <result property="order_state_id" column="order_state_id"/>
+        <result property="order_is_received" column="order_is_received"/>
+        <result property="kind_id" column="kind_id"/>
         <result property="delivery_type_id" column="delivery_type_id"/>
         <result property="distance" column="distance"/>
 
@@ -762,7 +764,6 @@
         THEN oi.order_time + #{expireSeconds}*1000
         ELSE oi.order_time + 864000000 <!-- 10天 = 10*24*60*60*1000 = 864000000毫秒 -->
         END as arrival_time,
-
         ob.order_product_amount,
         ob.order_payment_amount,
         ob.currency_id,
@@ -776,6 +777,8 @@
         oi.delivery_type_id,
         oi.buyer_user_id,
         oi.order_picked_time,
+        oi.order_is_received,
+        oi.kind_id,
         IF((SELECT count(*) FROM shop_order_base WHERE buyer_user_id = oi.buyer_user_id AND order_state_id IN
         (2011,2012,
         2013, 2014, 2020, 2030, 2040))>1,2,1)