This commit is contained in:
苏尹岚
2021-03-02 11:37:07 +08:00
parent 1f82ec3f0d
commit 5cb65919c2
3 changed files with 43 additions and 32 deletions

View File

@@ -40,14 +40,16 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
getCode = fmt.Sprintf("<B>饿百取货码:%s</B><BR><BR>\n", jxutils.GetEbaiOrderGetCode(order)) getCode = fmt.Sprintf("<B>饿百取货码:%s</B><BR><BR>\n", jxutils.GetEbaiOrderGetCode(order))
} }
orderFmt := `` orderFmt := ``
if storeDetail.BrandIsPrint == model.NO { if storeDetail != nil {
orderFmt += ` if storeDetail.BrandIsPrint == model.NO {
orderFmt += `
<CB>%s</CB><BR><BR> <CB>%s</CB><BR><BR>
` `
if order.VendorOrgCode == "34665" { if order.VendorOrgCode == "34665" {
orderParams = append(orderParams, globals.StoreNameEbai2) orderParams = append(orderParams, globals.StoreNameEbai2)
} else { } else {
orderParams = append(orderParams, storeDetail.BrandName) orderParams = append(orderParams, storeDetail.BrandName)
}
} }
} }
orderFmt += ` orderFmt += `
@@ -124,14 +126,16 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
} }
orderParams := []interface{}{} orderParams := []interface{}{}
orderFmt := `` orderFmt := ``
if storeDetail.BrandIsPrint == model.NO { if storeDetail != nil {
orderFmt += ` if storeDetail.BrandIsPrint == model.NO {
orderFmt += `
<CB>%s</CB><BR><BR> <CB>%s</CB><BR><BR>
` `
if order.VendorOrgCode == "34665" { if order.VendorOrgCode == "34665" {
orderParams = append(orderParams, globals.StoreNameEbai2) orderParams = append(orderParams, globals.StoreNameEbai2)
} else { } else {
orderParams = append(orderParams, storeDetail.BrandName) orderParams = append(orderParams, storeDetail.BrandName)
}
} }
} }
orderFmt += ` orderFmt += `

View File

@@ -39,14 +39,16 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
} }
orderParams := []interface{}{} orderParams := []interface{}{}
orderFmt := `` orderFmt := ``
if storeDetail.BrandIsPrint == model.NO { if storeDetail != nil {
orderFmt += ` if storeDetail.BrandIsPrint == model.NO {
<FS2><center>%s</center></FS2>\n\n orderFmt += `
` <FS2><center>%s</center></FS2>\n\n
if order.VendorOrgCode == "34665" { `
orderParams = append(orderParams, globals.StoreNameEbai2) if order.VendorOrgCode == "34665" {
} else { orderParams = append(orderParams, globals.StoreNameEbai2)
orderParams = append(orderParams, storeDetail.BrandName) } else {
orderParams = append(orderParams, storeDetail.BrandName)
}
} }
} }
orderFmt += ` orderFmt += `
@@ -117,14 +119,16 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
} }
orderParams := []interface{}{} orderParams := []interface{}{}
orderFmt := `` orderFmt := ``
if storeDetail.BrandIsPrint == model.NO { if storeDetail != nil {
orderFmt += ` if storeDetail.BrandIsPrint == model.NO {
orderFmt += `
<FS2><center>%s</center></FS2>\n\n <FS2><center>%s</center></FS2>\n\n
` `
if order.VendorOrgCode == "34665" { if order.VendorOrgCode == "34665" {
orderParams = append(orderParams, globals.StoreNameEbai2) orderParams = append(orderParams, globals.StoreNameEbai2)
} else { } else {
orderParams = append(orderParams, storeDetail.BrandName) orderParams = append(orderParams, storeDetail.BrandName)
}
} }
} }
orderFmt += ` orderFmt += `

View File

@@ -40,14 +40,17 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
} }
orderParams := []interface{}{} orderParams := []interface{}{}
orderFmt := `` orderFmt := ``
if storeDetail.BrandIsPrint == model.NO { if storeDetail != nil {
orderFmt += `
if storeDetail.BrandIsPrint == model.NO {
orderFmt += `
<S2><C>%s</C></S2><RN><RN> <S2><C>%s</C></S2><RN><RN>
` `
if order.VendorOrgCode == "34665" { if order.VendorOrgCode == "34665" {
orderParams = append(orderParams, globals.StoreNameEbai2) orderParams = append(orderParams, globals.StoreNameEbai2)
} else { } else {
orderParams = append(orderParams, storeDetail.BrandName) orderParams = append(orderParams, storeDetail.BrandName)
}
} }
} }
orderFmt += ` orderFmt += `