增加模版示例

2024-11-12 09:39:29 +08:00 · 2024-11-12 09:39:29 +08:00 · 3777caf93c
commit 3777caf93c
parent dcc53bf15d
7 changed files with 74 additions and 16 deletions
--- a/mall-common/src/main/java/com/suisung/mall/common/pojo/vo/ShopStoreOrderPrintVO.java
+++ b/mall-common/src/main/java/com/suisung/mall/common/pojo/vo/ShopStoreOrderPrintVO.java
@ -24,7 +24,7 @@ import java.util.Date;
@Accessors(chain = true)
@NoArgsConstructor
@AllArgsConstructor
-@ApiModel(value = "ShopStoreOrderPrint显示对象", description = "门店订单打印实体类")
+@ApiModel(value = "ShopStoreOrderPrint显示对象", description = "门店下单打印实体类")
 public class ShopStoreOrderPrintVO implements Serializable {

    private static final long serialVersionUID = 1L;
@ -52,6 +52,9 @@ public class ShopStoreOrderPrintVO implements Serializable {
    private String fetch_no;

    // 买家相关信息
+    @ApiModelProperty(value = "买家用户名")
+    private String buyer_user_name;
+
    @ApiModelProperty(value = "买家订单备注")
    private String buyer_order_remark;

@ -68,6 +71,9 @@ public class ShopStoreOrderPrintVO implements Serializable {
    @ApiModelProperty(value = "配送来源")
    private String shipper_type;

+    @ApiModelProperty(value = "下单时间")
+    private String order_time;
+
    @ApiModelProperty(value = "付款时间")
    private String pay_time;

@ -101,7 +107,7 @@ public class ShopStoreOrderPrintVO implements Serializable {

    // 订单商品详情信息
    @ApiModelProperty(value = "订单商品详情信息")
-    private ShopStoreOrderProductPrintVO order_item;
+    private ShopStoreOrderProductPrintVO order_items;

    @ApiModelProperty(value = "状态：1-有效；2-无效；")
    private Integer status;
--- a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java
+++ b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java
@ -1045,7 +1045,7 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
     *
     * @param request
     * @param response
-     * @param payment_channel_code
+     * @param payment_channel_code 支付渠道码 alipay, wx_native
     * @return
     */
    @Override
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/listener/OrderPayedListener.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/listener/OrderPayedListener.java
@ -10,6 +10,8 @@ import com.suisung.mall.shop.order.service.ShopOrderBaseService;
 import com.suisung.mall.shop.order.service.ShopOrderInfoService;
 import com.suisung.mall.shop.store.service.ShopStorePrinterService;
 import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
@ -25,15 +27,13 @@ import java.util.List;
@RabbitListener(queues = MqConstant.SHOP_PAIDYES_QUEUE, concurrency = "5-10")
 public class OrderPayedListener {

+    private static final Logger logger = LoggerFactory.getLogger(OrderPayedListener.class);
    @Autowired
    private ShopOrderBaseService shopOrderBaseService;
-
    @Autowired
    private ShopOrderInfoService shopOrderInfoService;
-
    @Autowired
    private ShopStorePrinterService shopStorePrinterService;
-
    @Autowired
    private MqMessageService mqMessageService;

@ -45,6 +45,8 @@ public class OrderPayedListener {
        try {
            boolean flag = false;

+            logger.info("收到微信异步通知消息data:{}-chanel:{}-message:{}", data, channel, message);
+
            for (String orderId : order_id_row) {
                //判断是否为线下支付订单
                ShopOrderInfo orderInfoOld = shopOrderInfoService.get(orderId);
@ -64,8 +66,11 @@ public class OrderPayedListener {
                        flag = shopOrderBaseService.setPaidYes(Collections.singletonList(orderId));
                    }

+                    logger.info("#### 支付异步通知回调处理是否成功：{} ####", flag);
+
                    // 生成取单号和打印小票
-                    if(flag) {
+                    if (flag) {
+                        logger.info("####开始生成取单号####");
                        ShopOrderInfo orderInfo = new ShopOrderInfo();
                        orderInfo.setOrder_id(orderId);
                        // 生成取单号，写入order_info
@ -79,6 +84,7 @@ public class OrderPayedListener {
            }

            if (flag) {
+                // 操作成功，标记消息消费成功
                channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
            } else {
                log.error("消息消费失败，执行setPaidYes异常，当前订单编号：{}", order_id_row);
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterModelServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterModelServiceImpl.java
@ -58,7 +58,7 @@ public class ShopStorePrinterModelServiceImpl extends BaseServiceImpl<ShopStoreP

    @Override
    public CommonResult addNewShopStorePrinterModel(ShopStorePrinterModel record) {
-        //TODO 判断有没有权限删除
+        // 判断有没有权限删除
        UserDto user = getCurrentUser();
        if (user==null) {
            return CommonResult.failed("用户信息异常!");
--- 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
@ -258,10 +258,10 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl<ShopStorePrinte

        String sn = "922441475";

-        ShopStoreOrderProductPrintVO order1 = new ShopStoreOrderProductPrintVO("可口可乐CocaCola经典美味汽水1.25L/瓶", 110, new BigDecimal("8100.45"),"6970448170051");
-        ShopStoreOrderProductPrintVO order2 = new ShopStoreOrderProductPrintVO( "排骨约350g（默认砍小块）", 1, new BigDecimal("150.13"),"6970448170051");
-        ShopStoreOrderProductPrintVO order3 = new ShopStoreOrderProductPrintVO("新鲜虫草花1包约200g 韭菜1000g 鸡蛋2003克", 11, new BigDecimal("4.01"),"6970448170051");
-        ShopStoreOrderProductPrintVO order4 = new ShopStoreOrderProductPrintVO("冰红茶风味饮料", 1, new BigDecimal("13.24"),"6970448170051");
+        ShopStoreOrderProductPrintVO order1 = new ShopStoreOrderProductPrintVO("可口可乐CocaCola经典美味汽水1.25L/瓶", 110, new BigDecimal("8100.45"), "6970448170051");
+        ShopStoreOrderProductPrintVO order2 = new ShopStoreOrderProductPrintVO("排骨约350g（默认砍小块）", 1, new BigDecimal("150.13"), "6970448170051");
+        ShopStoreOrderProductPrintVO order3 = new ShopStoreOrderProductPrintVO("新鲜虫草花1包约200g 韭菜1000g 鸡蛋2003克", 11, new BigDecimal("4.01"), "6970448170051");
+        ShopStoreOrderProductPrintVO order4 = new ShopStoreOrderProductPrintVO("冰红茶风味饮料", 1, new BigDecimal("13.24"), "6970448170051");
        List<ShopStoreOrderProductPrintVO> productList = new ArrayList<>();
        productList.add(order1);
        productList.add(order2);
@ -322,7 +322,7 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl<ShopStorePrinte
        binding.put("sn", "922441475");

        String sn = "922441475";
-        String cont = freeMakerUtils.processTemplate(template.getTemplate_name(), template.getTemplate_value(), binding);
+        String cont = FreeMakerUtils.processTemplate(template.getTemplate_name(), template.getTemplate_value(), binding);

 //        feieUtil.printContent(sn, cont);

@ -332,10 +332,10 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl<ShopStorePrinte

    @Override
    public Boolean printShopStoreOrder(String orderId) {
+        logger.info("#### 调用飞鹅打票机的打印操作开始 ####");
        // 获取订单，包含所有所需的字段，参考实体类：ShopStoreOrderPrintVO 和 ShopStoreOrderProductPrintVO

-//        long cntt = shopOrderInfoServiceImpl.genTodayPickupNum(3);
-
+        // long cntt = shopOrderInfoServiceImpl.genTodayPickupNum(3);
        if (StrUtil.isBlank(orderId)) {
            logger.info("订单为空，无法打印小票。");
            return false;
@ -374,7 +374,7 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl<ShopStorePrinte
 //        binding.put("order_items_tmpl", order_items_tmpl);

        // 生成打印内容（暂时飞鹅打票机的内容）
-        String printContent = freeMakerUtils.processTemplate(template.getTemplate_name(), template.getTemplate_value(), binding);
+        String printContent = FreeMakerUtils.processTemplate(template.getTemplate_name(), template.getTemplate_value(), binding);
        if (StrUtil.isBlank(printContent)) {
            logger.info("订单{}信息模版渲染异常，无法打印小票。", orderId);
            return false;
@ -391,6 +391,8 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl<ShopStorePrinte
        ShopStorePrinterLog shopStorePrinterLog = new ShopStorePrinterLog(template.getCategory(), storeId, orderId, template.getTemplate_id(), template.getTemplate_value(), JsonUtil.object2json(binding), printContent);
        shopStorePrinterLogService.insertShopStorePrinterLog(shopStorePrinterLog);

+        logger.debug("#### 调用飞鹅打票机的打印操作结束 ####");
+
        return true;
    }

--- a/mall-shop/src/main/resources/templates/refund_order_printer.txt
+++ b/mall-shop/src/main/resources/templates/refund_order_printer.txt
@ -0,0 +1,44 @@
+
+示例格式化后的：
+<CB>小发同城</CB><BR>
+--------------------------------<BR>
+<CB>#00019232</CB><BR>
+<L>买家备注：不用敲门，放在门口旁边的外卖箱，打个电话告知送达就行，谢谢！！！</L><BR>
+<BOLD>配送时间：2024-10-25 14:00-14:30</BOLD><BR>
+--------------------------------<BR>
+订单编号：ES20231026111444527685<BR>
+订单来源：微信小程序<BR>
+支付方式：微信支付<BR>
+配送来源：顺丰同城<BR>
+付款时间：2024-10-25 14:00:23<BR>
+申请退款时间：2024-10-27 14:05:23<BR>
+申请完成时间：2024-10-27 14:8:23<BR>
+--------------------------------<BR>
+<C>******* 退款商品 ******</C><BR>
+--------------------------------<BR>
+<L>可口可乐CocaC</L>     <L><BOLD> x110 </BOLD></L><L> 8100.45</L><BR>
+<L>ola经典美味汽水1.2</L><BR>
+<L>5L/瓶</L><BR>
+<BOLD>6970448170051</BOLD><BR>
+<L>排骨约350g（默    </L><L><BOLD>   1  </BOLD></L><L> 150.13 </L><BR>
+<L>认砍小块）</L><BR>
+<BOLD>6970448170053</BOLD><BR>
+--------------------------------<BR>
+退款方式：<BOLD>仅退款</BOLD><BR>
+申请金额：<BOLD>￥32.7</BOLD><BR>
+退款原因：<BOLD>商家发货少了</BOLD><BR>
+实付金额：<BOLD>￥428.9元</BOLD><BR>
+微信退款金额：<BOLD>￥5.54（原路返回）</BOLD><BR>
+余额退款金额：<BOLD>￥5（退回会员余额）</BOLD><BR>
+--------------------------------<BR>
+<BOLD>会员名称：张三</BOLD><BR>
+<BOLD>会员手机：13128778765</BOLD><BR>
+<BOLD>会员备注：本店前100名注册优质用户</BOLD><BR>
+--------------------------------<BR>
+操作员：李小明<BR>
+
+格式化模版：
+
+
+原模版：
+<CB>${store_name}</CB><BR>--------------------------------<BR><CB>#${order_pickup_num_str}</CB><BR><L>买家备注：${order_message!'-'}</L><BR><BOLD>配送时间：${delivery_time}</BOLD><BR>--------------------------------<BR>订单编号：${order_id}<BR>订单来源：微信小程序<BR>支付方式：微信支付<BR>配送来源：顺丰同城<BR>付款时间：${payment_time}<BR>--------------------------------<BR><L>商品名称           数量     金额</L><BR>--------------------------------<BR><#list order_items as item><L>${item.s_name}</L><L><BOLD>${item.s_quantity}</BOLD></L><L>${item.s_amount}</L><BR><#if item.s_name_segs??><#list item.s_name_segs as seg><L>${seg}</L><BR></#list></#if><BOLD><#if item.product_sn?default("")?trim?length gt 1>${item.product_sn}</BOLD><BR></#if></#list>--------------------------------<BR>商品总件数：<BOLD>${order_items_count!0}</BOLD><BR>商品总额：<BOLD>￥${order_product_amount?string('0.00')}</BOLD><BR>押金：<BOLD>￥${(yajin!0)?string('0.00')}</BOLD><BR>运费：<BOLD>￥${order_shipping_fee?string('0.00')}</BOLD><BR>会员权益：<BOLD>-￥${(quanyi!0)?string('0.00')}</BOLD><BR>秒杀：<BOLD>-￥${(miaosha!0)?string('0.00')}</BOLD><BR>实付金额：<BOLD>￥${order_payment_amount?string('0.00')}</BOLD><BR><#if seller_message?default("")?trim?length gt 1>--------------------------------<BR><BOLD>商家备注：${seller_message!'---'}</BOLD><BR></#if>--------------------------------<BR><BOLD>收货人：${buyer_user_name!''}</BOLD><BR><BOLD>收货人手机：${store_tel!''}</BOLD><BR><BOLD>收货地址：${da_province!'-'}${da_city!'-'}${da_address!'-'}</BOLD><BR>--------------------------------<BR>门店：${store_name}<BR>门店电话：<BOLD>${store_tel!'-'}</BOLD><BR>收银员：${cashier!'-'}<BR>
--- a/mall-shop/target/classes/static/ip/ip2region.xdb
+++ b/mall-shop/target/classes/static/ip/ip2region.xdb