From e4f623420d08145926362afdb7e52c107c864685 Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Mon, 18 Aug 2025 15:10:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A2=84=E8=AE=A1=E6=94=B6?= =?UTF-8?q?=E5=85=A5=E5=A2=9E=E5=8A=A0=E4=BA=86=20=E6=89=93=E5=8C=85?= =?UTF-8?q?=E8=B4=B9=EF=BC=8C=20=E6=89=93=E5=8D=B0=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/shop/order/mapper/ShopOrderBaseMapper.java | 3 ++- .../shop/order/service/ShopOrderBaseService.java | 4 ++-- .../service/impl/ShopOrderBaseServiceImpl.java | 9 +++++---- .../service/impl/ShopOrderInfoServiceImpl.java | 2 +- .../admin/ShopStorePrinterController.java | 4 ++-- .../shop/store/service/ShopStorePrinterService.java | 3 ++- .../service/impl/ShopStorePrinterServiceImpl.java | 11 +++++++---- .../resources/mapper/order/ShopOrderBaseMapper.xml | 13 +++++++++---- .../src/main/resources/templates/order_printer.txt | 5 +++-- 9 files changed, 33 insertions(+), 21 deletions(-) diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/mapper/ShopOrderBaseMapper.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/mapper/ShopOrderBaseMapper.java index a349cae4..cca3395f 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/mapper/ShopOrderBaseMapper.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/mapper/ShopOrderBaseMapper.java @@ -55,11 +55,12 @@ public interface ShopOrderBaseMapper extends BaseMapper { /** * 获取已付款订单的打印信息（用于渲染打票机模版） * + * @param storeId * @param orderId * @param payState * @return */ - Map getOrderPrintInfo(@Param("orderId") String orderId, Integer payState); + Map getOrderPrintInfo(@Param("storeId") Integer storeId, @Param("orderId") String orderId, @Param("payState") Integer payState); /** diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderBaseService.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderBaseService.java index aed9ecbd..544ea9d8 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderBaseService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderBaseService.java @@ -12,7 +12,6 @@ import com.suisung.mall.common.pojo.req.SFCreateOrderReq; import com.suisung.mall.core.web.service.IBaseService; import com.suisung.mall.shop.order.vo.OrdeListVo; import com.suisung.mall.shop.product.pojo.vo.FixOrderVo; -import org.apache.ibatis.annotations.Param; import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; @@ -518,11 +517,12 @@ public interface ShopOrderBaseService extends IBaseService { /** * 获取已付款订单的打印信息（用于渲染打票机模版） * + * @param storeId * @param orderId * @param payState 支付状态，参考StateCode.ORDER_PAID_STATE_YES * @return */ - Map getOrderPrintInfo(@Param("orderId") String orderId, @Param("payState") Integer payState); + Map getOrderPrintInfo(Integer storeId, String orderId, Integer payState); /** 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 94c7c97f..6ec9cccc 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 @@ -106,7 +106,6 @@ import io.seata.tm.api.GlobalTransaction; import io.seata.tm.api.GlobalTransactionContext; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; -import org.apache.ibatis.annotations.Param; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -8442,12 +8441,13 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl /** * 支付成功后，立即打印门店的订单信息 * + * @param storeId * @param orderId * @return */ - Boolean printShopStoreOrder(String orderId); + Boolean printShopStoreOrder(Integer storeId, String orderId); /** * 获取店铺所有有效打印机 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 251914da..84473b8c 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 @@ -306,9 +306,9 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl binding = shopOrderBaseService.getOrderPrintInfo(orderId, StateCode.ORDER_PAID_STATE_YES); + Map binding = shopOrderBaseService.getOrderPrintInfo(storeId, orderId, StateCode.ORDER_PAID_STATE_YES); if (binding == null) { logger.error("订单{}信息无法获取，无法打印小票。", orderId); return false; } - Integer storeId = Convert.toInt(binding.get("store_id")); // NumberUtil.parseInt(binding.get("store_id").toString()); + if (CheckUtil.isEmpty(storeId) && binding.get("store_id") != null) { + storeId = Convert.toInt(binding.get("store_id")); + } + // 从订单里，获取店铺 Id，再找出打印机，下单订单打印模版（如果没使用公共的下单订单模版） List printerList = selectPrinterList(storeId); if (CollUtil.isEmpty(printerList)) { diff --git a/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml b/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml index acee7a92..7b8b1793 100644 --- a/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml +++ b/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml @@ -537,6 +537,7 @@ b.order_title, b.delivery_type_id, b.payment_type_id, b.payment_time, b.order_pickup_num, c.order_message, c.order_item_amount, c.order_shipping_fee, c.order_shipping_fee_amount, c.delivery_time, (c.order_discount_amount + c.voucher_price + c.order_points_fee + c.order_adjust_fee) as total_discount_amount, + c.packing_fee, e.store_tel, f.da_province,f.da_city,f.da_address,f.da_mobile, f.order_id, g.payment_channel_id, h.payment_channel_name @@ -549,11 +550,15 @@ left join pay_consume_trade g on a.order_id=g.order_id left join pay_payment_channel h on g.payment_channel_id=h.payment_channel_id - + + and a.store_id=#{storeId} + + + and a.order_id=#{orderId} - + and b.order_is_paid=#{payState} @@ -778,8 +783,8 @@ (od.order_discount_amount + od.voucher_price + od.order_points_fee + od.order_adjust_fee) as total_discount_amount, - - (ob.order_product_amount-od.order_discount_amount-od.voucher_price-od.order_points_fee-od.order_adjust_fee-od.platform_fee-od.order_shipping_fee) + + (ob.order_product_amount-od.order_discount_amount-od.voucher_price-od.order_points_fee-od.order_adjust_fee-od.platform_fee-od.order_shipping_fee+od.packing_fee) as order_income_amount, od.platform_fee, od.packing_fee, diff --git a/mall-shop/src/main/resources/templates/order_printer.txt b/mall-shop/src/main/resources/templates/order_printer.txt index 6841dd09..1e248a80 100644 --- a/mall-shop/src/main/resources/templates/order_printer.txt +++ b/mall-shop/src/main/resources/templates/order_printer.txt @@ -34,7 +34,8 @@ 商品总额：￥18.7
押金：￥500
运费：￥5.54
-会员权益：-￥50
+打包费：￥0.54
+优惠金额：-￥50
秒杀：-￥100
实付金额：￥428.9元
--------------------------------
@@ -56,4 +57,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')}
押金：￥${(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!''}
收货人手机：${da_mobile!'-'}
收货地址：${da_province!'-'}${da_city!'-'}${da_address!'-'}
--------------------------------
门店：${store_name}
门店电话：${store_tel!'-'}
收银员：${cashier!'店长'}
第二版带变量的模版： -${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')}
优惠金额：-￥${(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 +${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