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
%s#%d
%s:%s
--------------------------------
-下单时间: %s
-预计送达: %s
-订单编号: %s
+下单时间: %s
+预计送达: %s
+订单编号: %s
`
if order.BusinessType == model.BusinessTypeDingshida {
orderFmt += `
@@ -71,8 +72,8 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
%s
` + getCode +
`客户: %s
-电话: %s
-地址: %s
+电话: %s
+地址: %s
客户备注:
%s
@@ -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 %s
`
+ orderFmt += `%s %s
`
} else {
- orderFmt += `%s %s
`
+ orderFmt += `%s %s
`
}
orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
//switch order.EarningType {