From 4795af4acc3d227a5aa3e398dca4ac6ad984d474 Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Tue, 14 Oct 2025 17:08:48 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=AE=A2=E5=8D=95=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E8=BF=87=E9=95=BF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/common/modules/order/dto/MchOrderInfoDTO.java | 4 ++++ .../mall/shop/lakala/service/impl/LakalaApiServiceImpl.java | 2 ++ .../shop/order/service/impl/ShopOrderBaseServiceImpl.java | 3 ++- .../src/main/resources/mapper/order/ShopOrderBaseMapper.xml | 5 ++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/order/dto/MchOrderInfoDTO.java b/mall-common/src/main/java/com/suisung/mall/common/modules/order/dto/MchOrderInfoDTO.java index 23378173..05f732dc 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/modules/order/dto/MchOrderInfoDTO.java +++ b/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 = "订单运费") diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java index f3772397..f05d4d0e 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java +++ b/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 diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java index 1c596304..885a735e 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java @@ -6529,8 +6529,9 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl 100) { + if (StrUtil.length(firstProductName) > 100) { firstProductName = firstProductName.substring(0, 100); } product_item_name = firstProductName + "等商品"; diff --git a/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml b/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml index ac55d2d7..a4b55af8 100644 --- a/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml +++ b/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml @@ -586,6 +586,8 @@ + + @@ -762,7 +764,6 @@ THEN oi.order_time + #{expireSeconds}*1000 ELSE oi.order_time + 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)