Merge branch 'master' into get-store

globals/beegodb/beegodb.go

@@ -47,6 +47,8 @@ func Init() {
 
 	// 如下语句建表时要出错（INDEX名字太长了），暂时放一下，必须放最后一句
 	orm.RegisterModel(&model.OrderFinancial{}, &model.AfsOrder{}, &model.OrderDiscountFinancial{}, &model.OrderSkuFinancial{})
+	// orm.RegisterModel(&model.Act{}, &model.ActOrderRule{}, &model.ActStoreSku{})
+	// orm.RegisterModel(&model.ActMap{}, &model.ActStoreMap{}, &model.ActStoreSkuMap{})
 	// create table
 	orm.RunSyncdb("default", false, true)
 }

globals/globals.go

@@ -25,6 +25,7 @@ var (
 	AliSecret string
 
 	EnableStoreWrite     bool
+	EnableJdStoreWrite   bool
 	EnableEbaiStoreWrite bool
 	EnableElmStoreWrite  bool
 	EnableMtwmStoreWrite bool
@@ -40,6 +41,8 @@ var (
 
 	GetWeixinTokenURL string
 	GetWeixinTokenKey string
+
+	StoreName string
 )
 
 func init() {
@@ -55,13 +58,14 @@ func init() {
 func Init() {
 	SugarLogger.Infof("globals RunMode=%s", beego.BConfig.RunMode)
 	ReallyCallPlatformAPI = (beego.BConfig.RunMode != "dev" && beego.BConfig.RunMode != "test")
-	ReallySendWeixinMsg = ReallyCallPlatformAPI && beego.BConfig.RunMode == "prod"
-	ReallyReplyComment = ReallyCallPlatformAPI && beego.BConfig.RunMode == "prod"
+	ReallySendWeixinMsg = ReallyCallPlatformAPI && IsProductEnv()
+	ReallyReplyComment = ReallyCallPlatformAPI && IsProductEnv()
 
 	AliKey = beego.AppConfig.DefaultString("aliKey", "")
 	AliSecret = beego.AppConfig.DefaultString("aliSecret", "")
 
 	EnableStoreWrite = beego.AppConfig.DefaultBool("enableStoreWrite", false)
+	EnableJdStoreWrite = EnableStoreWrite && beego.AppConfig.DefaultBool("enableJdStoreWrite", false)
 	EnableEbaiStoreWrite = EnableStoreWrite && beego.AppConfig.DefaultBool("enableEbaiStoreWrite", false)
 	EnableElmStoreWrite = EnableStoreWrite && beego.AppConfig.DefaultBool("enableElmStoreWrite", false)
 	EnableMtwmStoreWrite = EnableStoreWrite && beego.AppConfig.DefaultBool("enableMtwmStoreWrite", false)
@@ -78,6 +82,8 @@ func Init() {
 
 	GetWeixinTokenURL = beego.AppConfig.DefaultString("getWeixinTokenURL", "")
 	GetWeixinTokenKey = beego.AppConfig.DefaultString("getWeixinTokenKey", "")
+
+	StoreName = beego.AppConfig.DefaultString("storeName", "京西菜市")
 }
 
 func IsCallbackAlwaysReturnSuccess() bool {

globals/refutil/refutil.go

@@ -20,6 +20,10 @@ func CheckAndGetStructValue(item interface{}) *reflect.Value {
 	return &value
 }
 
+func IsFieldExist(obj interface{}, fieldName string) bool {
+	return reflect.Indirect(reflect.ValueOf(obj)).FieldByName(fieldName).IsValid()
+}
+
 func GetObjFieldByName(obj interface{}, fieldName string) interface{} {
 	return reflect.Indirect(reflect.ValueOf(obj)).FieldByName(fieldName).Interface()
 }