- fixed a bug in defsch.init, replace LoadOrder with GetOrder.

- dynamic table name for legacy order related table.

globals/api/api.go

@@ -23,7 +23,7 @@ var (
 	AutonaviAPI *autonavi.API
 )
 
-func init() {
+func Init() {
 	JdAPI = jdapi.New(beego.AppConfig.String("jdToken"), beego.AppConfig.String("jdAppKey"), beego.AppConfig.String("jdSecret"))
 	initElm()
 	MtpsAPI = mtpsapi.New(beego.AppConfig.String("mtpsAppKey"), beego.AppConfig.String("mtpsSecret"))

globals/db/db.go

@@ -10,20 +10,21 @@ import (
 	_ "github.com/go-sql-driver/mysql" // import your used driver
 )
 
-func init() {
+func Init() {
 	// set default database
 	orm.RegisterDataBase("default", "mysql", beego.AppConfig.String("dbConnectStr"), 30)
-	models.RegisterModels()
+	if globals.CallLegacyMsgHandler {
+		models.RegisterModels()
+	}
 	if globals.CallNewMsgHandler {
 		orm.RegisterModel(new(model.GoodsOrder))
 		orm.RegisterModel(new(model.OrderSku))
 		orm.RegisterModel(new(model.Waybill))
 		orm.RegisterModel(new(model.OrderStatus))
-
-		// orm.RegisterModel(new(legacyorder.Elemeorder2))
-		// orm.RegisterModel(new(legacyorder.Jdorder2))
 		orm.RegisterModel(new(legacyorder.Jxorder2))
 		orm.RegisterModel(new(legacyorder.Jxordersku2))
+		// orm.RegisterModel(new(legacyorder.Elemeorder2))
+		// orm.RegisterModel(new(legacyorder.Jdorder2))
 	}
 	// create table
 	orm.RunSyncdb("default", false, true)

globals/globals.go

@@ -18,18 +18,37 @@ var (
 	ReallyCallPlatformAPI bool
 
 	SugarLogger *zap.SugaredLogger
+
+	JxorderTableName    string
+	JxorderskuTableName string
+	ElemeorderTableName string
+	JdorderTableName    string
 )
 
 func init() {
 	logs.SetLogFuncCallDepth(3)
 	beego.BConfig.Log.AccessLogs = true
 
+	logger, _ := zap.NewDevelopment()
+	SugarLogger = logger.Sugar()
+	baseapi.Init(SugarLogger)
+}
+
+func Init() {
 	CallLegacyMsgHandler = beego.AppConfig.DefaultBool("callLegacyMsgHandler", true)
 	CallNewMsgHandler = beego.AppConfig.DefaultBool("callNewMsgHandler", false)
 	GenerateLegacyJxOrder = beego.AppConfig.DefaultBool("generateLegacyJxOrder", false)
 	ReallyCallPlatformAPI = !CallLegacyMsgHandler
 
-	logger, _ := zap.NewDevelopment()
-	SugarLogger = logger.Sugar()
-	baseapi.Init(SugarLogger)
+	if ReallyCallPlatformAPI {
+		JxorderTableName = "jxorder"
+		JxorderskuTableName = "jxordersku"
+		ElemeorderTableName = "elemeorder"
+		JdorderTableName = "jdorder"
+	} else {
+		JxorderTableName = "jxorder2"
+		JxorderskuTableName = "jxordersku2"
+		ElemeorderTableName = "elemeorder2"
+		JdorderTableName = "jdorder2"
+	}
 }