diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go
index 340daf0ba..c2edc8e47 100644
--- a/business/partner/printer/feie/feie.go
+++ b/business/partner/printer/feie/feie.go
@@ -245,6 +245,111 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
return fmt.Sprintf(strings.Replace(orderFmt, "\n", "", -1), orderParams...)
}
+// getOrderContentBig805334 天星桥专属
+func (c *PrinterHandler) getOrderContentBig805334(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) (content string) {
+ expectedDeliveryTime := order.ExpectedDeliveredTime
+ if utils.IsTimeZero(expectedDeliveryTime) {
+ expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour)
+ }
+ getCode := ""
+ if order.VendorID == model.VendorIDEBAI {
+ getCode = fmt.Sprintf("淘宝闪购取货码:%s
\n", jxutils.GetEbaiOrderGetCode(order))
+ }
+ orderParams := []interface{}{}
+ orderFmt := ``
+ if storeDetail != nil {
+ if storeDetail.BrandIsPrint == model.NO {
+ orderFmt += `%s
`
+ if order.VendorOrgCode == "34665" {
+ orderParams = append(orderParams, globals.StoreNameEbai2)
+ } else {
+ orderParams = append(orderParams, storeDetail.BrandName)
+ }
+ }
+ }
+ orderFmt += `%s#%d
+%s:%s
+--------------------------------
+下单时间: %s
+预计送达: %s
+订单编号: %s
+
`
+
+ if order.BusinessType == model.BusinessTypeDingshida {
+ orderFmt += `
+预订单
+`
+ } else {
+ orderFmt += `
+立即送达
+`
+ }
+
+ orderFmt += `%s
+` + getCode +
+ `客户: %s
+电话: %s
+地址: %s
+客户备注:
+%s
+
+商品明细:
+品名数量单价小计
+--------------------------------
`
+ // 实际支付:%s
+ orderParams = append(orderParams,
+ jxutils.GetVendorName(order.VendorID),
+ order.OrderSeq,
+ order.StoreName, storeTel,
+ utils.Time2Str(order.OrderCreatedAt),
+ utils.Time2Str(expectedDeliveryTime),
+ order.VendorOrderID,
+ order.VendorOrderID,
+ order.ConsigneeName,
+ order.ConsigneeMobile,
+ order.ConsigneeAddress,
+ order.BuyerComment,
+ // jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),
+ )
+
+ for _, sku := range order.Skus {
+ if sku.Count > 1 {
+ orderFmt += `%s %s
`
+ } else {
+ orderFmt += `%s %s
`
+ }
+ orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
+
+ //orderFmt += `%s
`
+ //switch order.EarningType {
+ //case model.EarningTypePoints: // 扣点
+ // orderFmt += `%s %s %s
`
+ // orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count)))
+ //case model.EarningTypeQuote: // 报价
+ // orderFmt += `%s
`
+ // orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
+ //}
+ //orderFmt += `%s %s %s
`
+ //orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count)))
+ //标品需要打印条形码
+ if sku.Upc != "" {
+ orderFmt += `upc码: %s
`
+ orderParams = append(orderParams, sku.Upc)
+ }
+ }
+ orderFmt += `
+共%d种%d件商品
+实付:%s
+--------------------------------
+商品质量问题请联系:
+更多信息请关注官方微信: %s
+--------------------------------
+`
+ // http://weixin.qq.com/r/tkkDGzTERmk5rXB49xyk
+ orderParams = append(orderParams, order.SkuCount, order.GoodsCount, jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), globals.StoreName)
+ return fmt.Sprintf(strings.Replace(orderFmt, "\n", "", -1), orderParams...)
+}
+
// 打印取消或者退款订单
func (c *PrinterHandler) getCancelOrRefundOrderContent(order *model.GoodsOrder, printType int, storeDetail *dao.StoreDetail) (content string) {
expectedDeliveryTime := order.ExpectedDeliveredTime
@@ -389,7 +494,11 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store,
}
content := ""
if store.PrinterFontSize == partner.PrinterFontSizeBig || store.PrinterFontSize == partner.PrinterFontSizeBig2 {
- content = c.getOrderContentBig(order, store.Tel1, storeDetail)
+ if store.ID == 805334 {
+ content = c.getOrderContentBig805334(order, store.Tel1, storeDetail)
+ } else {
+ content = c.getOrderContentBig(order, store.Tel1, storeDetail)
+ }
} else {
content = c.getOrderContent(order, store.Tel1, storeDetail)
}