From c075f733a36d0ef94e24da2eadf47786a936bf83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 6 Mar 2026 16:07:37 +0800
Subject: [PATCH] 1

---
 business/jxcallback/orderman/orderman_ext.go |  3 +++
 business/partner/printer/feie/feie.go        | 17 +++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index 6b633cbd2..a2a4f249d 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -1729,6 +1729,9 @@ func GetMatterStoreOrderCount(ctx *jxcontext.Context, storeID int) (result *Orde
 			flag = false
 		}
 		orderTime = *orderPay.PayFinishedAt
+		if time.Now().Sub(orderTime) > 30*24*time.Hour {
+			orderTime = time.Now().AddDate(0, -1, 0)
+		}
 	} else {
 		orderTime = time.Now().AddDate(0, -1, 0)
 		flag = true
diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go
index 58e85a68f..340daf0ba 100644
--- a/business/partner/printer/feie/feie.go
+++ b/business/partner/printer/feie/feie.go
@@ -29,6 +29,7 @@ func init() {
 	partner.RegisterPrinterPlatform(CurPrinterHandler)
 }
 
+// getOrderContent 添加了BOLD 标签
 func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) (content string) {
 	expectedDeliveryTime := order.ExpectedDeliveredTime
 	if utils.IsTimeZero(expectedDeliveryTime) {
@@ -54,9 +55,9 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 <CB>%s#%d</CB><BR>
 <C><BOLD>%s:%s</BOLD></C><BR>
 --------------------------------<BR>
-下单时间: %s<BR>
-预计送达: %s<BR>
-订单编号: %s<BR>
+<BOLD>下单时间: %s</BOLD><BR>
+<BOLD>预计送达: %s</BOLD><BR>
+<BOLD>订单编号: %s</BOLD><BR>
 `
 	if order.BusinessType == model.BusinessTypeDingshida {
 		orderFmt += `
@@ -71,8 +72,8 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 <QR>%s</QR><BR>
 ` + getCode +
 		`客户: %s<BR>
-电话: %s<BR>
-地址: %s<BR>
+<BOLD>电话: %s</BOLD><BR>
+<BOLD>地址: %s</BOLD><BR>
 <BR>
 客户备注: <BR>
 <BOLD>%s</BOLD><BR>
@@ -98,7 +99,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 		order.BuyerComment,
 		// jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),
 	)
-	//switch order.EarningType {
+	//switch order.EarningType { 	z
 	//case model.EarningTypePoints: // 扣点
 	//	orderFmt += pricePoints
 	//case model.EarningTypeQuote: // 报价
@@ -107,9 +108,9 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 
 	for _, sku := range order.Skus {
 		if sku.Count > 1 {
-			orderFmt += `%s <RIGHT><BOLD>%s</BOLD></RIGHT><BR>`
+			orderFmt += `<BOLD>%s <RIGHT>%s</RIGHT></BOLD><BR>`
 		} else {
-			orderFmt += `%s <RIGHT>%s</RIGHT><BR>`
+			orderFmt += `<BOLD>%s <RIGHT>%s</RIGHT></BOLD><BR>`
 		}
 		orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
 		//switch order.EarningType {