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

2019-05-15 17:09:23 +08:00
parent e395c7c891
commit 2d3ed62d15
8 changed files with 30 additions and 18 deletions
--- 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
 }
--- 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{}{
--- 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 := `
-<CB>京西菜市</CB><BR><BR>
+<CB>%s</CB><BR><BR>
 <C>手机买菜上京西</C><BR>
 <C>极速到家送惊喜</C><BR>
 --------------------------------<BR>
@@ -59,6 +59,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 品名    数量    单价       小计<BR>
 --------------------------------<BR>`
 	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
 <C><L><BOLD>商品质量问题请联系:</BOLD></L><BR></C>
 <C><L><BOLD>%s:%s</BOLD></L><BR></C><BR>
 <BR>
-更多信息请关注官方微信: 京西菜市<BR>
+更多信息请关注官方微信: %s<BR>
 <BR>
 <BR><BR>
 --------------------------------<BR>
@@ -92,7 +93,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 <BR><BR>
 `
 	// <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), orderParams...)
 }

--- 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 := `
-<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)...)
 }

--- 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 := `
-<FS2><center>京西菜市</center></FS2>\n\n
+<FS2><center>%s</center></FS2>\n\n
 <center>手机买菜上京西</center>
 <center>极速到家送惊喜</center>\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
 <center><FH2>商品质量问题请联系:</FH2></center>
 <center><FH2>%s:%s</FH2></center>\n
-更多信息请关注官方微信: 京西菜市\n
+更多信息请关注官方微信: %s\n
 --------------------------------\n
 --------------------------------\n
 `
 	// <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 strings.Replace(fmt.Sprintf(strings.Replace(orderFmt, "\n", "", -1), orderParams...), "\\n", "\r\n", -1)
 }

--- 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 := `
-<S2><C>京西菜市</C></S2><RN><RN>
+<S2><C>%s</C></S2><RN><RN>
 <C>手机买菜上京西</C>
 <C>极速到家送惊喜</C><RN>
 ********************************
@@ -58,6 +58,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 品名    数量    单价       小计<RN>
 ********************************<RN>`
 	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
 ********************************<RN>
 <C><H2>商品质量问题请联系:</H2></C>
 <C><H2>%s:%s</H2></C><RN>
-更多信息请关注官方微信: 京西菜市<RN>
+更多信息请关注官方微信: %s<RN>
 ********************************<RN>
 ********************************<RN>
 `
 	// <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), orderParams...)
 }

--- 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"
--- 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 {