- handle pending orders and waybills when starting.

globals/api/api.go

@@ -8,6 +8,7 @@ import (
 	"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
 	"git.rosy.net.cn/baseapi/platformapi/weixinapi"
 	"git.rosy.net.cn/baseapi/utils"
+	_ "git.rosy.net.cn/jx-callback/globals/db"
 	"github.com/astaxie/beego"
 
 	"github.com/astaxie/beego/orm"

globals/db/db.go

@@ -0,0 +1,30 @@
+package db
+
+import (
+	"git.rosy.net.cn/jx-callback/business/legacyorder"
+	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/globals"
+	"git.rosy.net.cn/jx-callback/legacy/models"
+	"github.com/astaxie/beego"
+	"github.com/astaxie/beego/orm"
+	_ "github.com/go-sql-driver/mysql" // import your used driver
+)
+
+func init() {
+	// set default database
+	orm.RegisterDataBase("default", "mysql", beego.AppConfig.String("dbConnectStr"), 30)
+	models.RegisterModels()
+	if globals.CallNew {
+		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))
+	}
+	// create table
+	orm.RunSyncdb("default", false, true)
+}

globals/globals.go

@@ -2,13 +2,8 @@ package globals
 
 import (
 	"git.rosy.net.cn/baseapi"
-	"git.rosy.net.cn/jx-callback/business/legacyorder"
-	"git.rosy.net.cn/jx-callback/business/model"
-	"git.rosy.net.cn/jx-callback/legacy/models"
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/logs"
-	"github.com/astaxie/beego/orm"
-	_ "github.com/go-sql-driver/mysql" // import your used driver
 	"go.uber.org/zap"
 )
 
@@ -35,24 +30,4 @@ func init() {
 	logger, _ := zap.NewDevelopment()
 	SugarLogger = logger.Sugar()
 	baseapi.Init(SugarLogger)
-	initDB()
-}
-
-func initDB() {
-	// set default database
-	orm.RegisterDataBase("default", "mysql", beego.AppConfig.String("dbConnectStr"), 30)
-	models.RegisterModels()
-	if CallNew {
-		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))
-	}
-	// create table
-	orm.RunSyncdb("default", false, true)
 }