From d530054e031476820535eb782dfd9cc84ca24f67 Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Sat, 29 Nov 2025 17:18:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF=EF=BC=8C?= =?UTF-8?q?=E5=92=8C=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8D=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mobile/LakalaController.java | 2 +- .../impl/ShopOrderBaseServiceImpl.java | 2 +- .../impl/ShopOrderReturnServiceImpl.java | 16 +++++++++-- .../service/ShopStorePrinterService.java | 3 +-- .../impl/ShopStorePrinterServiceImpl.java | 27 ++++++++++--------- .../mapper/order/ShopOrderReturnMapper.xml | 2 +- .../templates/refund_order_printer.txt | 4 +-- 7 files changed, 34 insertions(+), 22 deletions(-) diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/controller/mobile/LakalaController.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/controller/mobile/LakalaController.java index 43ee78a6..547dcf72 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/controller/mobile/LakalaController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/controller/mobile/LakalaController.java @@ -94,7 +94,7 @@ public class LakalaController extends BaseControllerImpl { // return lakalaApiService.tradeQuery(paramsJSON.getInt("storeId"), paramsJSON.getStr("orderId")); - return shopStorePrinterService.printShopStoreReturnOrder(paramsJSON.getStr("orderId"), paramsJSON.getStr("returnId")); + return shopStorePrinterService.printShopStoreReturnOrder(paramsJSON.getStr("returnId")); } @ApiOperation(value = "批量发送推送消息 - 测试案例", notes = "批量发送推送消息 - 测试案例") 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 2cfd74d1..6ba8d32b 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 @@ -5195,7 +5195,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl Convert.toInt(getCurrentUser().getStore_id())); - List return_ids = Convert.toList(String.class, shopOrderReturn.getReturn_id()); + String returnId = shopOrderReturn.getReturn_id(); + + List return_ids = Convert.toList(String.class, returnId); List orderReturns = gets(return_ids); if (!CheckUtil.checkDataRights(store_id, orderReturns, ShopOrderReturn::getStore_id)) { @@ -1416,6 +1426,9 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl itemQueryWrapper = new QueryWrapper<>(); itemQueryWrapper.eq("order_id", orderId); List allOrderItems = shopOrderItemService.find(itemQueryWrapper); - if (CollectionUtil.isEmpty(allOrderItems)) { logger.warn("订单剩余商品退款申请失败：订单商品表为空，订单ID: {}", orderId); throw new ApiException(I18nUtil._("订单商品表为空！")); diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStorePrinterService.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStorePrinterService.java index 7aa53d9f..638e06a4 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStorePrinterService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStorePrinterService.java @@ -83,11 +83,10 @@ public interface ShopStorePrinterService extends IBaseService /** * 退货成功后，立即打印门店的退货信息 * - * @param orderId * @param returnId * @return */ - Boolean printShopStoreReturnOrder(String orderId, String returnId); + Boolean printShopStoreReturnOrder(String returnId); /** * 获取店铺所有有效打印机 diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java index 31f14fb4..23b062bd 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java @@ -32,6 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.util.Pair; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -407,7 +408,7 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl * 该方法通过调用飞鹅打票机接口，完成指定订单的退货小票打印功能。主要流程包括： * 1. 校验订单号是否合法； @@ -417,12 +418,12 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl * - * @param orderId 订单编号，不能为空 * @param returnId 退货单编号，用于标识具体的退货记录 * @return 打印操作是否成功，成功返回 true，否则返回 false */ + @Async @Override - public Boolean printShopStoreReturnOrder(String orderId, String returnId) { + public Boolean printShopStoreReturnOrder(String returnId) { logger.debug("#### 调用飞鹅打票机的打印退款订单操作开始 ####"); // 参数校验 @@ -433,16 +434,16 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl orderItems = binding.getOrder_items(); + List orderItems = orderPrintVO.getOrder_items(); if (CollUtil.isEmpty(orderItems)) { logger.error("订单{}商品信息为空，无法打印小票。", orderId); return false; @@ -479,10 +480,10 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl用户退款订单
 +用户退款订单
${store_name}
--------------------------------
#${order_pickup_num_str}
@@ -78,4 +78,4 @@ ${store_name}
--------------------------------
#${order_pickup_num_str}
买家备注：${order_message!'-'}
配送时间：${delivery_time}
--------------------------------
订单编号：${order_id}
订单来源：微信小程序
支付方式：微信支付
配送来源：顺丰同城
付款时间：${payment_time}
--------------------------------
商品名称 数量 金额
--------------------------------
<#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')}
押金：￥${(yajin!0)?string('0.00')}
运费：￥${order_shipping_fee?string('0.00')}
会员权益：-￥${(quanyi!0)?string('0.00')}
秒杀：-￥${(miaosha!0)?string('0.00')}
实付金额：￥${order_payment_amount?string('0.00')}
<#if seller_message?default("")?trim?length gt 1>--------------------------------
商家备注：${seller_message!'---'}
--------------------------------
收货人：${buyer_user_name!''}
收货人手机：${store_tel!''}
收货地址：${da_province!'-'}${da_city!'-'}${da_address!'-'}
--------------------------------
门店：${store_name}
门店电话：${store_tel!'-'}
收银员：${cashier!'-'}
带参模版： -用户退款订单
${store_name}
--------------------------------
#${order_pickup_num_str}
退款原因：${return_buyer_message!'-'}
配送时间：${payment_time?string('yyyy-MM-dd HH:mm:ss')}（20-30分钟）
--------------------------------
订单编号：${order_id}
退单编号：${return_id}
订单来源：${order_channel_name!'微信小程序'}
支付方式：${payment_type_name!'微信支付'}
配送来源：${deliver_type_name!'顺丰同城'}
付款时间：${payment_time?string('yyyy-MM-dd HH:mm:ss')}
申请退款：${return_add_time?string('yyyy-MM-dd HH:mm:ss')}
确认退款：${return_finish_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_payment_amount?string('0.00')}元
配送费：￥${order_shipping_fee?string('0.00')}元
申请退款：￥${return_refund_amount?string('0.00')}
退款方式：${return_flag_str}
商家审批备注：${return_store_message!'-'}
--------------------------------
会员名称：${buyer_user_name}
会员手机：${return_tel}
--------------------------------
操作员：${cashier!'-'}
+用户退款订单
${store_name}
--------------------------------
#${order_pickup_num_str}
退款原因：${return_buyer_message!'-'}
配送时间：${payment_time?string('yyyy-MM-dd HH:mm:ss')}（20-30分钟）
--------------------------------
订单编号：${order_id}
退单编号：${return_id}
订单来源：${order_channel_name!'微信小程序'}
支付方式：${payment_type_name!'微信支付'}
配送来源：${deliver_type_name!'顺丰同城'}
付款时间：${payment_time?string('yyyy-MM-dd HH:mm:ss')}
申请退款：${return_add_time?string('yyyy-MM-dd HH:mm:ss')}
确认退款：${return_finish_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_payment_amount?string('0.00')}元
配送费：￥${order_shipping_fee?string('0.00')}元
申请退款：￥${return_refund_amount?string('0.00')}
退款方式：${return_flag_str}
商家审批备注：${return_store_message!'-'}
--------------------------------
会员名称：${buyer_user_name}
会员手机：${return_tel}
--------------------------------
操作员：${cashier!'-'}