diff --git a/mall-common/src/main/java/com/suisung/mall/common/service/impl/CommonService.java b/mall-common/src/main/java/com/suisung/mall/common/service/impl/CommonService.java index 47eeb7f2..68e87869 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/service/impl/CommonService.java +++ b/mall-common/src/main/java/com/suisung/mall/common/service/impl/CommonService.java @@ -90,11 +90,19 @@ public class CommonService { * @return 配送方式名称 */ public static String getDeliveryExpressName(Integer deliveryTypeId) { - if (deliveryTypeId == null) return "其他配送"; - String name = StateCode.DELIVERY_TYPE_MAP.get(deliveryTypeId); - return name != null ? name : "其他配送"; + // 当配送方式ID为空时，默认返回顺丰同城 + if (deliveryTypeId == null) { + log.debug("配送方式ID为空，返回默认配送方式：顺丰同城"); + return "顺丰同城"; + } + + // 从配送方式映射表中获取名称，如果未找到则返回默认值顺丰同城 + String deliveryName = StateCode.DELIVERY_TYPE_MAP.getOrDefault(deliveryTypeId, "顺丰同城"); + log.debug("获取配送方式名称：deliveryTypeId={} deliveryName={}", deliveryTypeId, deliveryName); + return deliveryName; } + /** * 判断配送方式是否为同城配送 * 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 57b38a74..6aa797a0 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 @@ -8914,7 +8914,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl 订单来源：微信小程序
支付方式：微信支付
-配送来源：顺丰同城
+配送来源：${deliver_type_name!'顺丰同城'}
付款时间：${payment_time?string('yyyy-MM-dd HH:mm:ss')}
--------------------------------
商品名称 数量 金额
@@ -103,4 +103,4 @@ ${store_name}
--------------------------------
#${order_pickup_num_str}
买家备注：${order_message!'-'}
配送时间：${payment_time?string('MM-dd HH:mm')}～${delivery_time?string('HH:mm')}
--------------------------------
订单编号：${order_id}
订单来源：微信小程序
支付方式：微信支付
配送来源：顺丰同城
付款时间：${payment_time?string('yyyy-MM-dd HH:mm:ss')}
--------------------------------
商品名称 数量 金额
--------------------------------
<#list order_items as item>${item.s_name}${item.s_quantity}${item.s_amount}
<#if item.s_name_segs??><#list item.s_name_segs as seg>${seg}
<#if item.product_sn?default("")?trim?length gt 1>${item.product_sn}
--------------------------------
商品总件数：${order_items_count!0}
商品总额：￥${order_product_amount?string('0.00')}
运费：￥${order_shipping_fee?string('0.00')}
<#if packing_fee?? && (packing_fee > 0)>打包费：￥${packing_fee?string('0.00')}
优惠金额：-￥${(quanyi!0)?string('0.00')}
实付金额：￥${order_payment_amount?string('0.00')}
<#if seller_message?default("")?trim?length gt 1>--------------------------------
商家备注：${seller_message!'-'}
--------------------------------
收货人：${buyer_user_name!''}
收货人手机：${da_mobile!'-'}
收货地址：${da_province!'-'}${da_city!'-'}${da_address!'-'}
--------------------------------
门店：${store_name}
门店电话：${store_tel!'-'}
收银员：${cashier!'店长'}
第三版带变量的模版（有预约订单） -<#if is_booking_order>【预约订单】
${store_name}
--------------------------------
#${order_pickup_num_str}
买家备注：${order_message!'-'}
配送时间：${payment_time?string('MM-dd HH:mm')}～${delivery_time?string('HH:mm')}
--------------------------------
订单编号：${order_id}
订单来源：微信小程序
支付方式：微信支付
配送来源：顺丰同城
付款时间：${payment_time?string('yyyy-MM-dd HH:mm:ss')}
--------------------------------
商品名称 数量 金额
--------------------------------
<#list order_items as item>${item.s_name}${item.s_quantity}${item.s_amount}
<#if item.s_name_segs??><#list item.s_name_segs as seg>${seg}
<#if item.product_sn?default("")?trim?length gt 1>${item.product_sn}

--------------------------------
商品总件数：${order_items_count!0}
商品总额：￥${order_product_amount?string('0.00')}
运费：￥${order_shipping_fee?string('0.00')}
<#if packing_fee?? && (packing_fee > 0)>打包费：￥${packing_fee?string('0.00')}
优惠金额：-￥${(quanyi!0)?string('0.00')}
实付金额：￥${order_payment_amount?string('0.00')}
<#if seller_message?default("")?trim?length gt 1>--------------------------------
商家备注：${seller_message!'-'}
--------------------------------
收货人：${buyer_user_name!''}
收货人手机：${da_mobile!'-'}
收货地址：${da_province!'-'}${da_city!'-'}${da_address!'-'}
--------------------------------
门店：${store_name}
门店电话：${store_tel!'-'}
收银员：${cashier!'店长'}
\ No newline at end of file +<#if is_booking_order>【预约订单】
${store_name}
--------------------------------
#${order_pickup_num_str}
买家备注：${order_message!'-'}
配送时间：${payment_time?string('MM-dd HH:mm')}～${delivery_time?string('HH:mm')}
--------------------------------
订单编号：${order_id}
订单来源：微信小程序
支付方式：微信支付
配送来源：${deliver_type_name!'顺丰同城'}
付款时间：${payment_time?string('yyyy-MM-dd HH:mm:ss')}
--------------------------------
商品名称 数量 金额
--------------------------------
<#list order_items as item>${item.s_name}${item.s_quantity}${item.s_amount}
<#if item.s_name_segs??><#list item.s_name_segs as seg>${seg}
<#if item.product_sn?default("")?trim?length gt 1>${item.product_sn}

--------------------------------
商品总件数：${order_items_count!0}
商品总额：￥${order_product_amount?string('0.00')}
运费：￥${order_shipping_fee?string('0.00')}
<#if packing_fee?? && (packing_fee > 0)>打包费：￥${packing_fee?string('0.00')}
优惠金额：-￥${(quanyi!0)?string('0.00')}
实付金额：￥${order_payment_amount?string('0.00')}
<#if seller_message?default("")?trim?length gt 1>--------------------------------
商家备注：${seller_message!'-'}
--------------------------------
收货人：${buyer_user_name!''}
收货人手机：${da_mobile!'-'}
收货地址：${da_province!'-'}${da_city!'-'}${da_address!'-'}
--------------------------------
门店：${store_name}
门店电话：${store_tel!'-'}
收银员：${cashier!'店长'}
\ No newline at end of file