- 将“京西菜市”常量尽量替换为配置变量

business/partner/printer/xiaowm/xiaowm.go

@@ -34,7 +34,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 		expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour)
 	}
 	orderFmt := `
-<big>    京西菜市**
+<big>    %s**
          手机买菜上京西*
          极速到家送惊喜*
 ------------------------------*
@@ -58,6 +58,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 --------------------------------*
 `
 	orderParams := []interface{}{
+		globals.StoreName,
 		utils.Time2Str(order.OrderCreatedAt),
 		utils.Time2Str(expectedDeliveryTime),
 		order.VendorOrderID,
@@ -82,13 +83,13 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 <S020>商品质量问题请联系:*
 <S020>%s:%s*
 *
-更多信息请关注官方微信: 京西菜市*
+更多信息请关注官方微信: %s*
 --------------------------------
 --------------------------------
 *<BEEP13500,3,2,1>*
 `
 	// <QR>http://weixin.qq.com/r/tkkDGzTERmk5rXB49xyk</QR>
-	orderParams = append(orderParams, order.SkuCount, order.GoodsCount, order.StoreName, storeTel)
+	orderParams = append(orderParams, order.SkuCount, order.GoodsCount, order.StoreName, storeTel, globals.StoreName)
 	return fmt.Sprintf(strings.Replace(orderFmt, "\n", "", -1), escapeString4Printer(orderParams)...)
 }
 
@@ -98,7 +99,7 @@ func (c *PrinterHandler) getOrderContent2(order *model.GoodsOrder, storeTel stri
 		expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour)
 	}
 	orderFmt := `
-|7    京西菜市
+|7    %s
 |5       手机买菜上京西
 |5       极速到家送惊喜
 |5--------------------------------
@@ -123,6 +124,7 @@ func (c *PrinterHandler) getOrderContent2(order *model.GoodsOrder, storeTel stri
 |5--------------------------------
 `
 	orderParams := []interface{}{
+		globals.StoreName,
 		utils.Time2Str(order.OrderCreatedAt),
 		utils.Time2Str(expectedDeliveryTime),
 		order.VendorOrderID,
@@ -147,11 +149,11 @@ func (c *PrinterHandler) getOrderContent2(order *model.GoodsOrder, storeTel stri
 |5商品质量问题请联系:
 |5%s:%s
 |5
-|5更多信息请关注官方微信: 京西菜市
+|5更多信息请关注官方微信: %s
 |5--------------------------------
 |5--------------------------------
 `
-	orderParams = append(orderParams, order.SkuCount, order.GoodsCount, order.StoreName, storeTel)
+	orderParams = append(orderParams, order.SkuCount, order.GoodsCount, order.StoreName, storeTel, globals.StoreName)
 	return fmt.Sprintf(orderFmt, escapeString4Printer(orderParams)...)
 }