diff --git a/business/partner/printer/trendit/trendit.go b/business/partner/printer/trendit/trendit.go
index c330933ec..084d8b1e1 100644
--- a/business/partner/printer/trendit/trendit.go
+++ b/business/partner/printer/trendit/trendit.go
@@ -203,11 +203,11 @@ func (c *PrinterHandler) getOrderContentV2(order *model.GoodsOrder, storeTel str
}
orderFmt += `
--------------------------------
+店铺名称: %s
下单时间: %s
期望送达: %s
客户姓名: %s
客户电话: %s
-店铺名称: %s
订单编号: %s
%s#%d
%s
@@ -220,11 +220,11 @@ func (c *PrinterHandler) getOrderContentV2(order *model.GoodsOrder, storeTel str
` + trenditapi.StrRepeat("-", 32) + `
`
orderParams = append(orderParams,
+ order.StoreName,
utils.Time2Str(order.OrderCreatedAt),
utils.Time2Str(expectedDeliveryTime),
order.ConsigneeName,
order.ConsigneeMobile,
- order.StoreName,
order.VendorOrderID,
jxutils.GetVendorName(order.VendorID),
order.OrderSeq,
@@ -273,11 +273,11 @@ func (c *PrinterHandler) getOrderContentBigV2(order *model.GoodsOrder, storeTel
}
orderFmt += `
--------------------------------
+店铺名称: %s
下单时间: %s
期望送达: %s
客户姓名: %s
客户电话: %s
-店铺名称: %s
订单编号: %s
%s#%d
%s
@@ -290,11 +290,11 @@ func (c *PrinterHandler) getOrderContentBigV2(order *model.GoodsOrder, storeTel
` + trenditapi.StrRepeat("-", 32) + `
`
orderParams = append(orderParams,
+ order.StoreName,
utils.Time2Str(order.OrderCreatedAt),
utils.Time2Str(expectedDeliveryTime),
order.ConsigneeName,
order.ConsigneeMobile,
- order.StoreName,
order.VendorOrderID,
jxutils.GetVendorName(order.VendorID),
order.OrderSeq,
@@ -345,11 +345,11 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
}
orderFmt += `
--------------------------------
+店铺名称: %s
下单时间: %s
期望送达: %s
客户姓名: %s
客户电话: %s
-店铺名称: %s
订单编号: %s
%s#%d
%s
@@ -362,11 +362,11 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
` + trenditapi.StrRepeat("-", 32) + `
`
orderParams = append(orderParams,
+ order.StoreName,
utils.Time2Str(order.OrderCreatedAt),
utils.Time2Str(expectedDeliveryTime),
order.ConsigneeName,
order.ConsigneeMobile,
- order.StoreName,
order.VendorOrderID,
jxutils.GetVendorName(order.VendorID),
order.OrderSeq,
@@ -419,11 +419,11 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
}
orderFmt += `
--------------------------------
+店铺名称: %s
下单时间: %s
期望送达: %s
客户姓名: %s
客户电话: %s
-店铺名称: %s
订单编号: %s
%s#%d
%s
@@ -436,11 +436,11 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
--------------------------------
`
orderParams = append(orderParams,
+ order.StoreName,
utils.Time2Str(order.OrderCreatedAt),
utils.Time2Str(expectedDeliveryTime),
order.ConsigneeName,
order.ConsigneeMobile,
- order.StoreName,
order.VendorOrderID,
jxutils.GetVendorName(order.VendorID),
order.OrderSeq,
diff --git a/business/partner/purchase/mtwm/callback.go b/business/partner/purchase/mtwm/callback.go
index 8b052275e..c1a38b7c5 100644
--- a/business/partner/purchase/mtwm/callback.go
+++ b/business/partner/purchase/mtwm/callback.go
@@ -51,7 +51,7 @@ func OnCallbackMsg(msg *mtwmapi.CallbackMsg, msgType string) (response *mtwmapi.
var skuStatus = make(map[int][]string, 0)
var operate = make(map[string]string, 0)
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)
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)