This commit is contained in:
邹宗楠
2025-12-30 14:43:11 +08:00
parent 85e635ce6f
commit 035b057b37
2 changed files with 9 additions and 9 deletions

View File

@@ -203,11 +203,11 @@ func (c *PrinterHandler) getOrderContentV2(order *model.GoodsOrder, storeTel str
} }
orderFmt += ` orderFmt += `
<font# bolder=0 height=1 width=1>--------------------------------</font#> <font# bolder=0 height=1 width=1>--------------------------------</font#>
<LEFT><font# bolder=0 height=2 width=1>店铺名称: %s</font#></LEFT><BR>
<LEFT>下单时间: %s</LEFT> <LEFT>下单时间: %s</LEFT>
<LEFT>期望送达: %s</LEFT> <LEFT>期望送达: %s</LEFT>
<LEFT>客户姓名: %s</LEFT> <LEFT>客户姓名: %s</LEFT>
<LEFT>客户电话: %s</LEFT> <LEFT>客户电话: %s</LEFT>
<LEFT>店铺名称: %s</LEFT>
<LEFT><font# bolder=0 height=2 width=1>订单编号: %s</font#></LEFT><BR> <LEFT><font# bolder=0 height=2 width=1>订单编号: %s</font#></LEFT><BR>
<C><font# bolder=0 height=2 width=2>%s#%d</font#> <C><font# bolder=0 height=2 width=2>%s#%d</font#>
<QR>%s</QR></C> <QR>%s</QR></C>
@@ -220,11 +220,11 @@ func (c *PrinterHandler) getOrderContentV2(order *model.GoodsOrder, storeTel str
` + trenditapi.StrRepeat("-", 32) + ` ` + trenditapi.StrRepeat("-", 32) + `
` `
orderParams = append(orderParams, orderParams = append(orderParams,
order.StoreName,
utils.Time2Str(order.OrderCreatedAt), utils.Time2Str(order.OrderCreatedAt),
utils.Time2Str(expectedDeliveryTime), utils.Time2Str(expectedDeliveryTime),
order.ConsigneeName, order.ConsigneeName,
order.ConsigneeMobile, order.ConsigneeMobile,
order.StoreName,
order.VendorOrderID, order.VendorOrderID,
jxutils.GetVendorName(order.VendorID), jxutils.GetVendorName(order.VendorID),
order.OrderSeq, order.OrderSeq,
@@ -273,11 +273,11 @@ func (c *PrinterHandler) getOrderContentBigV2(order *model.GoodsOrder, storeTel
} }
orderFmt += ` orderFmt += `
<font# bolder=0 height=2 width=1>--------------------------------</font#> <font# bolder=0 height=2 width=1>--------------------------------</font#>
<LEFT><font# bolder=0 height=2 width=1>店铺名称: %s</font#></LEFT><BR>
<LEFT>下单时间: %s</LEFT> <LEFT>下单时间: %s</LEFT>
<LEFT>期望送达: %s</LEFT> <LEFT>期望送达: %s</LEFT>
<LEFT>客户姓名: %s</LEFT> <LEFT>客户姓名: %s</LEFT>
<LEFT>客户电话: %s</LEFT> <LEFT>客户电话: %s</LEFT>
<LEFT>店铺名称: %s</LEFT>
<LEFT><font# bolder=1 height=2 width=1>订单编号: %s</font#></LEFT><BR> <LEFT><font# bolder=1 height=2 width=1>订单编号: %s</font#></LEFT><BR>
<C><font# bolder=0 height=2 width=2>%s#%d</font#> <C><font# bolder=0 height=2 width=2>%s#%d</font#>
<QR>%s</QR></C> <QR>%s</QR></C>
@@ -290,11 +290,11 @@ func (c *PrinterHandler) getOrderContentBigV2(order *model.GoodsOrder, storeTel
` + trenditapi.StrRepeat("-", 32) + ` ` + trenditapi.StrRepeat("-", 32) + `
` `
orderParams = append(orderParams, orderParams = append(orderParams,
order.StoreName,
utils.Time2Str(order.OrderCreatedAt), utils.Time2Str(order.OrderCreatedAt),
utils.Time2Str(expectedDeliveryTime), utils.Time2Str(expectedDeliveryTime),
order.ConsigneeName, order.ConsigneeName,
order.ConsigneeMobile, order.ConsigneeMobile,
order.StoreName,
order.VendorOrderID, order.VendorOrderID,
jxutils.GetVendorName(order.VendorID), jxutils.GetVendorName(order.VendorID),
order.OrderSeq, order.OrderSeq,
@@ -345,11 +345,11 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
} }
orderFmt += ` orderFmt += `
<font# bolder=0 height=1 width=1>--------------------------------</font#> <font# bolder=0 height=1 width=1>--------------------------------</font#>
<LEFT><font# bolder=0 height=2 width=1>店铺名称: %s</font#></LEFT><BR>
<LEFT>下单时间: %s</LEFT> <LEFT>下单时间: %s</LEFT>
<LEFT>期望送达: %s</LEFT> <LEFT>期望送达: %s</LEFT>
<LEFT>客户姓名: %s</LEFT> <LEFT>客户姓名: %s</LEFT>
<LEFT>客户电话: %s</LEFT> <LEFT>客户电话: %s</LEFT>
<LEFT>店铺名称: %s</LEFT>
<LEFT><font# bolder=0 height=2 width=1>订单编号: %s</font#></LEFT><BR> <LEFT><font# bolder=0 height=2 width=1>订单编号: %s</font#></LEFT><BR>
<C><font# bolder=0 height=2 width=2>%s#%d</font#> <C><font# bolder=0 height=2 width=2>%s#%d</font#>
<QR>%s</QR></C> <QR>%s</QR></C>
@@ -362,11 +362,11 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
` + trenditapi.StrRepeat("-", 32) + ` ` + trenditapi.StrRepeat("-", 32) + `
` `
orderParams = append(orderParams, orderParams = append(orderParams,
order.StoreName,
utils.Time2Str(order.OrderCreatedAt), utils.Time2Str(order.OrderCreatedAt),
utils.Time2Str(expectedDeliveryTime), utils.Time2Str(expectedDeliveryTime),
order.ConsigneeName, order.ConsigneeName,
order.ConsigneeMobile, order.ConsigneeMobile,
order.StoreName,
order.VendorOrderID, order.VendorOrderID,
jxutils.GetVendorName(order.VendorID), jxutils.GetVendorName(order.VendorID),
order.OrderSeq, order.OrderSeq,
@@ -419,11 +419,11 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
} }
orderFmt += ` orderFmt += `
<font# bolder=0 height=1 width=1>--------------------------------</font#> <font# bolder=0 height=1 width=1>--------------------------------</font#>
<LEFT><font# bolder=0 height=3 width=1>店铺名称: %s</font#></LEFT>
<LEFT><font# bolder=0 height=2 width=1>下单时间: %s</font#></LEFT> <LEFT><font# bolder=0 height=2 width=1>下单时间: %s</font#></LEFT>
<LEFT><font# bolder=0 height=2 width=1>期望送达: %s</font#></LEFT> <LEFT><font# bolder=0 height=2 width=1>期望送达: %s</font#></LEFT>
<LEFT><font# bolder=0 height=2 width=1>客户姓名: %s</font#></LEFT> <LEFT><font# bolder=0 height=2 width=1>客户姓名: %s</font#></LEFT>
<LEFT><font# bolder=0 height=2 width=1>客户电话: %s</font#></LEFT> <LEFT><font# bolder=0 height=2 width=1>客户电话: %s</font#></LEFT>
<LEFT><font# bolder=0 height=3 width=1>店铺名称: %s</font#></LEFT>
<LEFT><font# bolder=0 height=3 width=1>订单编号: %s</font#></LEFT><BR> <LEFT><font# bolder=0 height=3 width=1>订单编号: %s</font#></LEFT><BR>
<C><font# bolder=1 height=2 width=2>%s#%d</font#> <C><font# bolder=1 height=2 width=2>%s#%d</font#>
<QR>%s</QR></C> <QR>%s</QR></C>
@@ -436,11 +436,11 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
<font# bolder=0 height=1 width=1>--------------------------------</font#> <font# bolder=0 height=1 width=1>--------------------------------</font#>
` `
orderParams = append(orderParams, orderParams = append(orderParams,
order.StoreName,
utils.Time2Str(order.OrderCreatedAt), utils.Time2Str(order.OrderCreatedAt),
utils.Time2Str(expectedDeliveryTime), utils.Time2Str(expectedDeliveryTime),
order.ConsigneeName, order.ConsigneeName,
order.ConsigneeMobile, order.ConsigneeMobile,
order.StoreName,
order.VendorOrderID, order.VendorOrderID,
jxutils.GetVendorName(order.VendorID), jxutils.GetVendorName(order.VendorID),
order.OrderSeq, order.OrderSeq,

View File

@@ -51,7 +51,7 @@ func OnCallbackMsg(msg *mtwmapi.CallbackMsg, msgType string) (response *mtwmapi.
var skuStatus = make(map[int][]string, 0) var skuStatus = make(map[int][]string, 0)
var operate = make(map[string]string, 0) var operate = make(map[string]string, 0)
for _, v := range dataMap { for _, v := range dataMap {
if v.AppFoodCode != "" && v.AppPoiCode != "" { if v.AppFoodCode != "" && v.AppPoiCode != "" && v.DiffContents.IsSoldOut.Origin != v.DiffContents.IsSoldOut.Result {
skuStatus[v.DiffContents.IsSoldOut.Result] = append(skuStatus[v.DiffContents.IsSoldOut.Result], v.AppFoodCode) skuStatus[v.DiffContents.IsSoldOut.Result] = append(skuStatus[v.DiffContents.IsSoldOut.Result], v.AppFoodCode)
storeMap[v.AppPoiCode] = skuStatus storeMap[v.AppPoiCode] = skuStatus
operate[v.AppFoodCode] = fmt.Sprintf("%s:%s:0↑-1↓:前%d->后%d", v.OpAppKey, v.OpName, v.DiffContents.IsSoldOut.Origin, v.DiffContents.IsSoldOut.Result) operate[v.AppFoodCode] = fmt.Sprintf("%s:%s:0↑-1↓:前%d->后%d", v.OpAppKey, v.OpName, v.DiffContents.IsSoldOut.Origin, v.DiffContents.IsSoldOut.Result)