diff --git a/business/jxutils/netprinter/netprinter.go b/business/jxutils/netprinter/netprinter.go index c1af8db20..8f558ec9b 100644 --- a/business/jxutils/netprinter/netprinter.go +++ b/business/jxutils/netprinter/netprinter.go @@ -81,7 +81,8 @@ func PrintOrderByOrder4Store(ctx *jxcontext.Context, order *model.GoodsOrder, st PrintResult: partner.PrintResultNoPrinter, }, nil } - printResult, err = handler.PrintOrder(ctx, store, order) + storeDetail, _ := dao.GetStoreDetail(db, storeID, order.VendorID, order.VendorOrgCode) + printResult, err = handler.PrintOrder(ctx, store, storeDetail, order) if err == nil { dao.SetOrderPrintFlag(db, ctx.GetUserName(), order.VendorOrderID, order.VendorID, true) } diff --git a/business/model/dao/store.go b/business/model/dao/store.go index c6c1e57b9..94357ed47 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -62,9 +62,10 @@ type StoreDetail struct { MtwmToken string `json:"mtwmToken"` EbaiSupplierID string `json:"ebaiSupplierID"` - BrandName string `json:"brandName"` //品牌信息 - BrandLogo string `json:"brandLogo"` - BrandIsOpen int `json:"brandIsOpen"` + BrandName string `json:"brandName"` //品牌信息 + BrandLogo string `json:"brandLogo"` + BrandIsOpen int `json:"brandIsOpen"` + BrandIsPrint int `json:"brandIsPrint"` } // 带快递门店信息的 @@ -124,7 +125,8 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID, vendorOrgCo IF(om3.name <> '', om3.name, om3.user_id2) operator_name3, b.name brand_name, b.logo brand_logo, - b.is_open brand_is_open + b.is_open brand_is_open, + b.is_print brand_is_print FROM store t1 LEFT JOIN store_map t2 ON t1.id = t2.store_id AND t2.vendor_id = ? AND t2.deleted_at = ? LEFT JOIN place city ON city.code = t1.city_code diff --git a/business/partner/partner_printer.go b/business/partner/partner_printer.go index d72388153..faa3d7eca 100644 --- a/business/partner/partner_printer.go +++ b/business/partner/partner_printer.go @@ -3,6 +3,8 @@ package partner import ( "fmt" + "git.rosy.net.cn/jx-callback/business/model/dao" + "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" ) @@ -58,7 +60,7 @@ type IPrinterHandler interface { BindPrinter(ctx *jxcontext.Context, mapData map[string]interface{}) (bindResult *BindPrinterResult, err error) RebindPrinter(ctx *jxcontext.Context, lastBindResult *BindPrinterResult) (bindResult *BindPrinterResult, err error) - PrintOrder(ctx *jxcontext.Context, store *model.Store, order *model.GoodsOrder) (printerStatus *PrinterStatus, err error) + PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *PrinterStatus, err error) EmptyPrintList(ctx *jxcontext.Context, id1, id2 string) (err error) PlayText(ctx *jxcontext.Context, id1, id2, orderID, text string) (printerStatus *PrinterStatus, err error) diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go index 8d9dcf7c6..57757624f 100644 --- a/business/partner/printer/feie/feie.go +++ b/business/partner/printer/feie/feie.go @@ -5,6 +5,8 @@ import ( "strings" "time" + "git.rosy.net.cn/jx-callback/business/model/dao" + "git.rosy.net.cn/baseapi/platformapi/feieapi" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" @@ -27,7 +29,7 @@ func init() { partner.RegisterPrinterPlatform(CurPrinterHandler) } -func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel string) (content string) { +func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) (content string) { expectedDeliveryTime := order.ExpectedDeliveredTime if utils.IsTimeZero(expectedDeliveryTime) { expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour) @@ -37,13 +39,18 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin if order.VendorID == model.VendorIDEBAI { getCode = fmt.Sprintf("饿百取货码:%s

\n", jxutils.GetEbaiOrderGetCode(order)) } - if order.VendorOrgCode == "34665" { - orderParams = append(orderParams, globals.StoreNameEbai2) - } else { - orderParams = append(orderParams, globals.StoreName) + orderFmt := `` + if storeDetail.BrandIsPrint == model.NO { + orderFmt += ` + %s

+ ` + if order.VendorOrgCode == "34665" { + orderParams = append(orderParams, globals.StoreNameEbai2) + } else { + orderParams = append(orderParams, storeDetail.BrandName) + } } - orderFmt := ` -%s

+ orderFmt += ` 手机买菜上京西
极速到家送惊喜
--------------------------------
@@ -106,7 +113,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin return fmt.Sprintf(strings.Replace(orderFmt, "\n", "", -1), orderParams...) } -func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel string) (content string) { +func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) (content string) { expectedDeliveryTime := order.ExpectedDeliveredTime if utils.IsTimeZero(expectedDeliveryTime) { expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour) @@ -116,13 +123,18 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st getCode = fmt.Sprintf("饿百取货码:%s

\n", jxutils.GetEbaiOrderGetCode(order)) } orderParams := []interface{}{} - if order.VendorOrgCode == "34665" { - orderParams = append(orderParams, globals.StoreNameEbai2) - } else { - orderParams = append(orderParams, globals.StoreName) + orderFmt := `` + if storeDetail.BrandIsPrint == model.NO { + orderFmt += ` + %s

+ ` + if order.VendorOrgCode == "34665" { + orderParams = append(orderParams, globals.StoreNameEbai2) + } else { + orderParams = append(orderParams, storeDetail.BrandName) + } } - orderFmt := ` -%s

+ orderFmt += ` 手机买菜上京西
极速到家送惊喜
--------------------------------
@@ -218,16 +230,16 @@ func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, printerSN, pri return printerStatus, err } -func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { +func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { globals.SugarLogger.Debugf("feie PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID) if len(order.Skus) == 0 { return } content := "" if store.PrinterFontSize == partner.PrinterFontSizeBig { - content = c.getOrderContentBig(order, store.Tel1) + content = c.getOrderContentBig(order, store.Tel1, storeDetail) } else { - content = c.getOrderContent(order, store.Tel1) + content = c.getOrderContent(order, store.Tel1, storeDetail) } return c.PrintMsg(ctx, store.PrinterSN, store.PrinterKey, order.VendorOrderID, content) } diff --git a/business/partner/printer/xiaowm/xiaowm.go b/business/partner/printer/xiaowm/xiaowm.go index bad1498fd..0281451ad 100644 --- a/business/partner/printer/xiaowm/xiaowm.go +++ b/business/partner/printer/xiaowm/xiaowm.go @@ -5,6 +5,8 @@ import ( "strings" "time" + "git.rosy.net.cn/jx-callback/business/model/dao" + "git.rosy.net.cn/baseapi/platformapi/xiaowmapi" "git.rosy.net.cn/baseapi/utils" @@ -28,7 +30,7 @@ func init() { partner.RegisterPrinterPlatform(CurPrinterHandler) } -func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel string) (content string) { +func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) (content string) { expectedDeliveryTime := order.ExpectedDeliveredTime if utils.IsTimeZero(expectedDeliveryTime) { expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour) @@ -103,7 +105,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin return content } -func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel string) (content string) { +func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) (content string) { expectedDeliveryTime := order.ExpectedDeliveredTime if utils.IsTimeZero(expectedDeliveryTime) { expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour) @@ -290,16 +292,16 @@ func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, printerNumber, return printerStatus, err } -func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { +func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { globals.SugarLogger.Debugf("xiaowm PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID) var content string if isV500(store.PrinterSN) { content = c.getOrderContent2(order, store.Tel1) } else { if store.PrinterFontSize == partner.PrinterFontSizeBig { - content = c.getOrderContentBig(order, store.Tel1) + content = c.getOrderContentBig(order, store.Tel1, storeDetail) } else { - content = c.getOrderContent(order, store.Tel1) + content = c.getOrderContent(order, store.Tel1, storeDetail) } } return c.PrintMsg(ctx, store.PrinterSN, store.PrinterKey, order.VendorOrderID, content) diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go index 1f4a4cfc9..26bb599da 100644 --- a/business/partner/printer/yilianyun/yilianyun.go +++ b/business/partner/printer/yilianyun/yilianyun.go @@ -10,6 +10,7 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" @@ -27,7 +28,7 @@ func init() { partner.RegisterPrinterPlatform(CurPrinterHandler) } -func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel string) (content string) { +func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) (content string) { expectedDeliveryTime := order.ExpectedDeliveredTime if utils.IsTimeZero(expectedDeliveryTime) { expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour) @@ -37,14 +38,18 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin getCode = fmt.Sprintf("饿百取货码:%s\\n\n", jxutils.GetEbaiOrderGetCode(order)) } orderParams := []interface{}{} - if order.VendorOrgCode == "34665" { - orderParams = append(orderParams, globals.StoreNameEbai2) - } else { - orderParams = append(orderParams, globals.StoreName) + orderFmt := `` + if storeDetail.BrandIsPrint == model.NO { + orderFmt += ` +
%s
\n\n + ` + if order.VendorOrgCode == "34665" { + orderParams = append(orderParams, globals.StoreNameEbai2) + } else { + orderParams = append(orderParams, storeDetail.BrandName) + } } - //TODO 去掉单价和小计，2020-06-18 - orderFmt := ` -
%s
\n\n + orderFmt += `
手机买菜上京西
极速到家送惊喜
\n -------------------------------- @@ -101,7 +106,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin return strings.Replace(fmt.Sprintf(strings.Replace(orderFmt, "\n", "", -1), orderParams...), "\\n", "\r\n", -1) } -func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel string) (content string) { +func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) (content string) { expectedDeliveryTime := order.ExpectedDeliveredTime if utils.IsTimeZero(expectedDeliveryTime) { expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour) @@ -111,13 +116,18 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st getCode = fmt.Sprintf("饿百取货码:%s\\n\n", jxutils.GetEbaiOrderGetCode(order)) } orderParams := []interface{}{} - if order.VendorOrgCode == "34665" { - orderParams = append(orderParams, globals.StoreNameEbai2) - } else { - orderParams = append(orderParams, globals.StoreName) + orderFmt := `` + if storeDetail.BrandIsPrint == model.NO { + orderFmt += ` +
%s
\n\n + ` + if order.VendorOrgCode == "34665" { + orderParams = append(orderParams, globals.StoreNameEbai2) + } else { + orderParams = append(orderParams, storeDetail.BrandName) + } } - orderFmt := ` -
%s
\n\n + orderFmt += `
手机买菜上京西
极速到家送惊喜
\n -------------------------------- @@ -212,16 +222,16 @@ func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, machineCode, p return printerStatus, err } -func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { +func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { globals.SugarLogger.Debugf("yilianyun PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID) if len(order.Skus) == 0 { return } content := "" if store.PrinterFontSize == partner.PrinterFontSizeBig { - content = c.getOrderContentBig(order, store.Tel1) + content = c.getOrderContentBig(order, store.Tel1, storeDetail) } else { - content = c.getOrderContent(order, store.Tel1) + content = c.getOrderContent(order, store.Tel1, storeDetail) } return c.PrintMsg(ctx, store.PrinterSN, store.PrinterKey, order.VendorOrderID, content) } diff --git a/business/partner/printer/zhongwu/zhongwu.go b/business/partner/printer/zhongwu/zhongwu.go index bd48807ab..f9a453bb8 100644 --- a/business/partner/printer/zhongwu/zhongwu.go +++ b/business/partner/printer/zhongwu/zhongwu.go @@ -11,6 +11,7 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" @@ -28,7 +29,7 @@ func init() { partner.RegisterPrinterPlatform(CurPrinterHandler) } -func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel string) (content string) { +func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) (content string) { expectedDeliveryTime := order.ExpectedDeliveredTime if utils.IsTimeZero(expectedDeliveryTime) { expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour) @@ -38,13 +39,18 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin getCode = fmt.Sprintf("饿百取货码:%s\n", jxutils.GetEbaiOrderGetCode(order)) } orderParams := []interface{}{} - if order.VendorOrgCode == "34665" { - orderParams = append(orderParams, globals.StoreNameEbai2) - } else { - orderParams = append(orderParams, globals.StoreName) + orderFmt := `` + if storeDetail.BrandIsPrint == model.NO { + orderFmt += ` + %s + ` + if order.VendorOrgCode == "34665" { + orderParams = append(orderParams, globals.StoreNameEbai2) + } else { + orderParams = append(orderParams, storeDetail.BrandName) + } } - orderFmt := ` -%s + orderFmt += ` 手机买菜上京西 极速到家送惊喜 ******************************** @@ -102,7 +108,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin return fmt.Sprintf(strings.Replace(orderFmt, "\n", "", -1), orderParams...) } -func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel string) (content string) { +func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) (content string) { expectedDeliveryTime := order.ExpectedDeliveredTime if utils.IsTimeZero(expectedDeliveryTime) { expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour) @@ -112,13 +118,18 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st getCode = fmt.Sprintf("饿百取货码:%s\n", jxutils.GetEbaiOrderGetCode(order)) } orderParams := []interface{}{} - if order.VendorOrgCode == "34665" { - orderParams = append(orderParams, globals.StoreNameEbai2) - } else { - orderParams = append(orderParams, globals.StoreName) + orderFmt := `` + if storeDetail.BrandIsPrint == model.NO { + orderFmt += ` + %s + ` + if order.VendorOrgCode == "34665" { + orderParams = append(orderParams, globals.StoreNameEbai2) + } else { + orderParams = append(orderParams, storeDetail.BrandName) + } } - orderFmt := ` -%s + orderFmt += ` 手机买菜上京西 极速到家送惊喜 ******************************** @@ -206,13 +217,13 @@ func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, deviceID, devi return printerStatus, err } -func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { +func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { globals.SugarLogger.Debugf("zhongwu PrintOrderByOrder orderID:%s, storeID:%d", order.VendorOrderID, store.ID) content := "" if store.PrinterFontSize == partner.PrinterFontSizeBig { - content = c.getOrderContentBig(order, store.Tel1) + content = c.getOrderContentBig(order, store.Tel1, storeDetail) } else { - content = c.getOrderContent(order, store.Tel1) + content = c.getOrderContent(order, store.Tel1, storeDetail) } return c.PrintMsg(ctx, store.PrinterSN, store.PrinterKey, order.VendorOrderID, content) }