将京西菜市名字（及其它一些硬编码）做成配置项目

business/auth2/authprovider/mobile/mobile.go

@@ -46,7 +46,7 @@ func init() {
 func (a *Auther) SendVerifyCode(mobileNumber string) (verifyCode string, err error) {
 	verifyCode = a.GenerateVerifyCode(mobileNumber)
 	smsClient := aliyunsmsclient.New("http://dysmsapi.aliyuncs.com/")
-	response, err := smsClient.Execute(globals.AliKey, globals.AliSecret, mobileNumber, "京西菜市", "SMS_175583158", string(utils.MustMarshal(map[string]interface{}{
+	response, err := smsClient.Execute(globals.AliKey, globals.AliSecret, mobileNumber, globals.SMSSignName, globals.SMSMobileVerifyTemplate, string(utils.MustMarshal(map[string]interface{}{
 		"code": verifyCode,
 	})))
 	a.SaveVerifyCode(mobileNumber, verifyCode)

business/cs/weimob_order.go

@@ -95,7 +95,7 @@ func changeStoreSkusByOrder(order *weimobapi.OrderDetail) {
 				globals.SugarLogger.Debugf("changeStoreSkusByOrder orderID:%d, storeID:%d is empty", order.OrderNo, storeID)
 			}
 		} else {
-			globals.SugarLogger.Infof("[运营]，微商城订单:%d，手机:%s找不到唯一一个京西门店%d", order.OrderNo, receiverMobile, len(storeList))
+			globals.SugarLogger.Infof("[运营]，微商城订单:%d，手机:%s找不到唯一一个本地门店%d", order.OrderNo, receiverMobile, len(storeList))
 		}
 	} else {
 		globals.SugarLogger.Warnf("changeStoreSkusByOrder orderNo:%d, receiverMobile:%s failed with err:%v", order.OrderNo, receiverMobile, err)

business/jxcallback/orderman/order_comment.go

@@ -1,6 +1,7 @@
 package orderman
 
 import (
+	"fmt"
 	"math/rand"
 	"time"
 
@@ -52,7 +53,7 @@ var (
 			delayGapEnd:   COMMENTS_SCORE_THREE_END_DELAY_TIME,
 			comments: []string{
 				"感谢您对我们的肯定，祝您生活愉快！欢迎再次光临，谢谢！",
-				"感谢您对京西菜市的关照，我们会更加精益求精。",
+				fmt.Sprintf("感谢您对%s的关照，我们会更加精益求精。", globals.StoreName),
 				"感谢您的光临，您的支持是我们前进的动力！",
 			},
 		},

business/jxstore/misc/store_alert_inform.go

@@ -43,11 +43,11 @@ const (
 	OneDayName         = "单日"
 	OneWeekDayName     = "七日"
 	OneMonthDayName    = "三十日"
-	YellowAlertInfo    = "您的店铺京西菜市-%s，由于%s%s%s%d%%，可能会被系统下线，请及时补救。"
+	YellowAlertInfo    = "您的店铺-%s，由于%s%s%s%d%%，可能会被系统下线，请及时补救。"
-	RedAlertInfo       = "您的店铺京西菜市-%s，由于%s%s%s%d%%，会被系统下线，需要马上补救。"
+	RedAlertInfo       = "您的店铺-%s，由于%s%s%s%d%%，会被系统下线，需要马上补救。"
-	ExtraRedAlertInfo  = "您的店铺京西菜市-%s，由于%s%s%s%d%%，会被系统下线，需要马上补救。"
+	ExtraRedAlertInfo  = "您的店铺-%s，由于%s%s%s%d%%，会被系统下线，需要马上补救。"
-	NoOrderAlertInfo   = "您的店铺京西菜市-%s，由于近%s无订单，会被系统下线，需要马上补救。"
+	NoOrderAlertInfo   = "您的店铺-%s，由于近%s无订单，会被系统下线，需要马上补救。"
-	RiskOrderAlertInfo = "您的店铺京西菜市-%s，可能有虚假定单，定单号为:%s，可能会被罚款，请及时与运营联系！"
+	RiskOrderAlertInfo = "您的店铺-%s，可能有虚假定单，定单号为:%s，可能会被罚款，请及时与运营联系！"
 )
 
 var (

business/jxutils/smsmsg/smsmsg.go

@@ -56,7 +56,7 @@ func getOrderNotifyPhone(order *model.GoodsOrder) (phoneList []string) {
 }
 
 func NotifyNewOrder(order *model.GoodsOrder) (err error) {
-	err = SendSMSMsg(getOrderNotifyPhone(order), "京西菜市", "SMS_175583150", map[string]interface{}{
+	err = SendSMSMsg(getOrderNotifyPhone(order), globals.SMSSignName, globals.SMSNewOrderTemplate, map[string]interface{}{
 		"daySeq":        order.OrderSeq,
 		"consigneeName": order.ConsigneeName,
 		"payMoney":      jxutils.IntPrice2StandardString(order.ActualPayPrice),
@@ -65,7 +65,7 @@ func NotifyNewOrder(order *model.GoodsOrder) (err error) {
 }
 
 func NotifyOrderCanceled(order *model.GoodsOrder) (err error) {
-	err = SendSMSMsg(getOrderNotifyPhone(order), "京西菜市", "SMS_175573134", map[string]interface{}{
+	err = SendSMSMsg(getOrderNotifyPhone(order), globals.SMSSignName, globals.SMSOrderCanceledTemplate, map[string]interface{}{
 		"vendorName": model.VendorChineseNames[order.VendorID],
 		"seq":        order.OrderSeq,
 		"orderID":    order.VendorOrderID,

business/model/const.go

@@ -1,9 +1,12 @@
 package model
 
 import (
+	"fmt"
+
 	"git.rosy.net.cn/baseapi/platformapi/ebaiapi"
 	"git.rosy.net.cn/baseapi/platformapi/jdapi"
 	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
+	"git.rosy.net.cn/jx-callback/globals"
 )
 
 var (
@@ -23,11 +26,11 @@ var (
 	}
 
 	ShopChineseNames = map[int]string{
-		VendorIDJD:   "京西菜市",
+		VendorIDJD:   globals.StoreName,
-		VendorIDMTWM: "京西菜市",
+		VendorIDMTWM: globals.StoreNameMtwm,
-		VendorIDELM:  "饿鲜达", //"好菜鲜生",
+		VendorIDELM:  globals.StoreNameEbai,
-		VendorIDEBAI: "饿鲜达", //"好菜鲜生",
+		VendorIDEBAI: globals.StoreNameEbai,
-		VendorIDJX:   "京西商城",
+		VendorIDJX:   fmt.Sprintf("%s商城", globals.StoreName),
 		VendorIDWSC:  "微盟微商城",
 	}
 

business/partner/purchase/ebai/store.go

@@ -18,10 +18,6 @@ import (
 	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
-const (
-	VendorStorePrefix = "好菜鲜生"
-)
-
 type tEbaiStoreInfo struct {
 	model.Store
 	VendorOrgCode    string `orm:"size(32)" json:"vendorOrgCode"` // 同一平台下不同的商户代码，如果只有一个，可以为空
@@ -96,7 +92,7 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo
 			},
 		}
 		retVal.OriginalName = utils.Interface2String(result["name"])
-		_, retVal.Name = jxutils.SplitStoreName(retVal.OriginalName, partner.StoreNameSeparator, VendorStorePrefix)
+		_, retVal.Name = jxutils.SplitStoreName(retVal.OriginalName, partner.StoreNameSeparator, globals.StoreNameEbai)
 		retVal.DeliveryType = EbaiDeliveryType2Jx(utils.Interface2String(result["delivery_type"]))
 
 		retVal.SetOpTime(ebaiOpTime2Jx(result["business_time"]))

business/partner/purchase/elm/order_legacy_urge.go

@@ -10,7 +10,6 @@ import (
 )
 
 const (
-	ELM_SMS_SIGN_NAME                            = "京西菜市"          //饿了么短信推送的签名
 	ELM_SMS_REMINDERS_DAIPEISHONG_TEMPLATECODE   = "SMS_175573181" //饿了么待配送模板ID
 	ELM_SMS_REMINDERS_PEISHOGNZHONG_TEMPLATECODE = "SMS_175583155" //饿了么配送中模板ID
 )
@@ -41,7 +40,7 @@ func (c *PurchaseHandler) ClientUrgeOrder(orderID string) (err error) {
 			if templateCode != "" {
 				smsClient := aliyunsmsclient.New("http://dysmsapi.aliyuncs.com/")
 				if globals.ReallyCallPlatformAPI {
-					_, err = smsClient.Execute(globals.AliKey, globals.AliSecret, order.ConsigneeMobile, ELM_SMS_SIGN_NAME, templateCode, string(utils.MustMarshal(templateParams)))
+					_, err = smsClient.Execute(globals.AliKey, globals.AliSecret, order.ConsigneeMobile, globals.SMSSignName, templateCode, string(utils.MustMarshal(templateParams)))
 				}
 			}
 		}

business/partner/purchase/jd/store.go

@@ -20,10 +20,6 @@ import (
 	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
-const (
-	VendorStorePrefix = "京西菜市"
-)
-
 type tJdStoreInfo struct {
 	model.Store
 	VendorOrgCode string `orm:"size(32)" json:"vendorOrgCode"` // 同一平台下不同的商户代码，如果只有一个，可以为空
@@ -66,7 +62,7 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo
 			retVal.IsAutoOrder = -1
 		}
 		retVal.OriginalName = result.StationName
-		_, retVal.Name = jxutils.SplitStoreName(retVal.OriginalName, partner.StoreNameSeparator, VendorStorePrefix)
+		_, retVal.Name = jxutils.SplitStoreName(retVal.OriginalName, partner.StoreNameSeparator, globals.StoreName)
 		retVal.DeliveryType = JdDeliveryType2Jx(result.CarrierNo)
 
 		tel2 := result.Mobile

business/partner/purchase/mtwm/store.go

@@ -20,10 +20,6 @@ import (
 	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
-const (
-	VendorStorePrefix = "美好菜市"
-)
-
 var (
 	opTimeErrReg = regexp.MustCompile(`当前配送营业时间为:([\d:~,]*)`)
 )
@@ -51,7 +47,7 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo
 			},
 		}
 		retVal.OriginalName = result.Name
-		_, retVal.Name = jxutils.SplitStoreName(retVal.OriginalName, partner.StoreNameSeparator, VendorStorePrefix)
+		_, retVal.Name = jxutils.SplitStoreName(retVal.OriginalName, partner.StoreNameSeparator, globals.StoreNameMtwm)
 
 		retVal.SetOpTime(openTimeMtwm2JX(result.ShippingTime))
 		retVal.Status = bizStatusMtwm2JX(result.OpenLevel, result.IsOnline)

conf/app.conf

@@ -105,6 +105,13 @@ zhongwuAppSecret = "29435497822f52f3cf659c65da548a79"
 
 getWeixinTokenKey = "c928ed0d-87a3-441a-8517-f92f0167296f"
 storeName = "京西菜市"
+storeNameMtwm = "京西菜市"
+storeNameEbai = "饿鲜达"
+
+smsSignName = "京西菜市"
+smsMobileVerifyTemplate = "SMS_175583158"
+smsNewOrderTemplate = "SMS_175583150"
+smsOrderCanceledTemplate = "SMS_175573134"
 
 addEvent = true
 

globals/globals.go

@@ -37,7 +37,14 @@ var (
 	GetYLYTokenURL    string
 	GetWeimobTokenURL string
 
-	StoreName string
+	StoreName     string
+	StoreNameMtwm string
+	StoreNameEbai string
+
+	SMSSignName              string
+	SMSMobileVerifyTemplate  string
+	SMSNewOrderTemplate      string
+	SMSOrderCanceledTemplate string
 
 	EnableWXAuth2  bool
 	DisableWXAuth1 bool
@@ -96,7 +103,14 @@ func Init() {
 	GetWeimobTokenURL = beego.AppConfig.DefaultString("getWeimobTokenURL", "")
 	GetWeixinTokenKey = beego.AppConfig.DefaultString("getWeixinTokenKey", "")
 
-	StoreName = beego.AppConfig.DefaultString("storeName", "京西菜市")
+	StoreName = beego.AppConfig.String("storeName")
+	StoreNameMtwm = beego.AppConfig.String("storeNameMtwm")
+	StoreNameEbai = beego.AppConfig.String("storeNameEbai")
+
+	SMSSignName = beego.AppConfig.String("smsSignName")
+	SMSMobileVerifyTemplate = beego.AppConfig.String("smsMobileVerifyTemplate")
+	SMSNewOrderTemplate = beego.AppConfig.String("smsNewOrderTemplate")
+	SMSOrderCanceledTemplate = beego.AppConfig.String("smsOrderCanceledTemplate")
 
 	EnableWXAuth2 = true // beego.BConfig.RunMode == "beta"
 	DisableWXAuth1 = true