diff --git a/business/jxutils/jxutils_cms.go b/business/jxutils/jxutils_cms.go
index a3af6230e..88538c761 100644
--- a/business/jxutils/jxutils_cms.go
+++ b/business/jxutils/jxutils_cms.go
@@ -14,6 +14,7 @@ import (
"git.rosy.net.cn/baseapi/platformapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/model"
+ "git.rosy.net.cn/jx-callback/globals"
)
var (
@@ -82,9 +83,9 @@ func SplitStoreName(fullName, separator, defaultPrefix string) (prefix, bareName
func ComposeStoreName(bareName string, vendorID int) (fullName string) {
bareName = TrimDecorationChar(strings.Trim(bareName, "-"))
if vendorID == model.VendorIDJD {
- fullName = "京西菜市-" + bareName
+ fullName = globals.StoreName + "-" + bareName
} else {
- fullName = "京西菜市(" + bareName + ")"
+ fullName = globals.StoreName + "(" + bareName + ")"
}
return fullName
}
diff --git a/business/jxutils/weixinmsg/weixinmsg.go b/business/jxutils/weixinmsg/weixinmsg.go
index 4e2917afa..c73fa1fa3 100644
--- a/business/jxutils/weixinmsg/weixinmsg.go
+++ b/business/jxutils/weixinmsg/weixinmsg.go
@@ -347,7 +347,7 @@ func NotifySaleBill(storeID int, title, shopName, fileURL string) (err error) {
title = "当期账单"
}
if shopName == "" {
- shopName = "京西菜市"
+ shopName = globals.StoreName
}
data := map[string]interface{}{
"first": map[string]interface{}{
diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go
index 3764bd373..1fe7cfd55 100644
--- a/business/partner/printer/feie/feie.go
+++ b/business/partner/printer/feie/feie.go
@@ -33,7 +33,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour)
}
orderFmt := `
-京西菜市
+%s
手机买菜上京西
极速到家送惊喜
--------------------------------
@@ -59,6 +59,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
品名 数量 单价 小计
--------------------------------
`
orderParams := []interface{}{
+ globals.StoreName,
utils.Time2Str(order.OrderCreatedAt),
utils.Time2Str(expectedDeliveryTime),
order.VendorOrderID,
@@ -84,7 +85,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
商品质量问题请联系:
%s:%s
-更多信息请关注官方微信: 京西菜市
+更多信息请关注官方微信: %s
--------------------------------
@@ -92,7 +93,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
`
// http://weixin.qq.com/r/tkkDGzTERmk5rXB49xyk
- 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), orderParams...)
}
diff --git a/business/partner/printer/xiaowm/xiaowm.go b/business/partner/printer/xiaowm/xiaowm.go
index 5cb60ab93..06c7c71c2 100644
--- a/business/partner/printer/xiaowm/xiaowm.go
+++ b/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 := `
- 京西菜市**
+ %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
商品质量问题请联系:*
%s:%s*
*
-更多信息请关注官方微信: 京西菜市*
+更多信息请关注官方微信: %s*
--------------------------------
--------------------------------
**
`
// http://weixin.qq.com/r/tkkDGzTERmk5rXB49xyk
- 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)...)
}
diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go
index b0c6b0db7..17d76ecf5 100644
--- a/business/partner/printer/yilianyun/yilianyun.go
+++ b/business/partner/printer/yilianyun/yilianyun.go
@@ -33,7 +33,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour)
}
orderFmt := `
-京西菜市\n\n
+%s\n\n
手机买菜上京西
极速到家送惊喜\n
--------------------------------
@@ -57,6 +57,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
品名 数量 单价 小计\n
--------------------------------\n`
orderParams := []interface{}{
+ globals.StoreName,
utils.Time2Str(order.OrderCreatedAt),
utils.Time2Str(expectedDeliveryTime),
order.VendorOrderID,
@@ -81,12 +82,12 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
--------------------------------\n
商品质量问题请联系:
%s:%s\n
-更多信息请关注官方微信: 京西菜市\n
+更多信息请关注官方微信: %s\n
--------------------------------\n
--------------------------------\n
`
// http://weixin.qq.com/r/tkkDGzTERmk5rXB49xyk
- orderParams = append(orderParams, order.SkuCount, order.GoodsCount, order.StoreName, storeTel)
+ orderParams = append(orderParams, order.SkuCount, order.GoodsCount, order.StoreName, storeTel, globals.StoreName)
return strings.Replace(fmt.Sprintf(strings.Replace(orderFmt, "\n", "", -1), orderParams...), "\\n", "\r\n", -1)
}
diff --git a/business/partner/printer/zhongwu/zhongwu.go b/business/partner/printer/zhongwu/zhongwu.go
index 612bc077d..4558bcbaa 100644
--- a/business/partner/printer/zhongwu/zhongwu.go
+++ b/business/partner/printer/zhongwu/zhongwu.go
@@ -34,7 +34,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour)
}
orderFmt := `
-京西菜市
+%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,12 +83,12 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
********************************
商品质量问题请联系:
%s:%s
-更多信息请关注官方微信: 京西菜市
+更多信息请关注官方微信: %s
********************************
********************************
`
// http://weixin.qq.com/r/tkkDGzTERmk5rXB49xyk
- 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), orderParams...)
}
diff --git a/conf/app.conf b/conf/app.conf
index bdb9a572b..ea6b5ffee 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -83,6 +83,7 @@ zhongwuAppID = 8000192
zhongwuAppSecret = "29435497822f52f3cf659c65da548a79"
getWeixinTokenKey = "c928ed0d-87a3-441a-8517-f92f0167296f"
+storeName = "京西菜市"
[dev]
jdToken = "df97f334-f7d8-4b36-9664-5784d8ae0baf"
@@ -203,6 +204,7 @@ dingdingQRCodeSecret = "N9dyC9qB84sauQPs4_JYrILMsG5Krqm9-PSSVJ8t9hb87rrHiFUirISx
dingdingCallbackURL = "http://callback-jxgy.jxc4.com/dingding/msg"
getWeixinTokenURL = "http://www.jxc4.com/v2/sys/GetWXToken"
+storeName = "京西果园"
[test]
jdToken = "df97f334-f7d8-4b36-9664-5784d8ae0baf"
diff --git a/globals/globals.go b/globals/globals.go
index 1b79cf835..ea92b747c 100644
--- a/globals/globals.go
+++ b/globals/globals.go
@@ -41,6 +41,8 @@ var (
GetWeixinTokenURL string
GetWeixinTokenKey string
+
+ StoreName string
)
func init() {
@@ -80,6 +82,8 @@ func Init() {
GetWeixinTokenURL = beego.AppConfig.DefaultString("getWeixinTokenURL", "")
GetWeixinTokenKey = beego.AppConfig.DefaultString("getWeixinTokenKey", "")
+
+ StoreName = beego.AppConfig.DefaultString("storeName", "京西菜市")
}
func IsCallbackAlwaysReturnSuccess() bool {