Merge remote-tracking branch 'origin/mark' into don

globals/api/apimanager/apimanager.go

@@ -1,26 +1,32 @@
 package apimanager
 
 import (
+	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
+type VendorOrgCodePair struct {
+	VendorID   int
+	AppOrgCode string
+}
+
 type APIManager struct {
 }
 
 var (
-	curAPIManager *APIManager
+	CurAPIManager *APIManager
 )
 
 func init() {
 	globals.SugarLogger.Debug("init apimanager")
-	curAPIManager = &APIManager{}
-	partner.InitAPIManager(curAPIManager)
+	CurAPIManager = &APIManager{}
+	partner.InitAPIManager(CurAPIManager)
 }
 
-func (a *APIManager) GetAPI(vendorID int, name string) (pfAPI interface{}) {
+func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{}) {
 	switch vendorID {
 	case model.VendorIDJD:
 		pfAPI = api.JdAPI
@@ -31,3 +37,32 @@ func (a *APIManager) GetAPI(vendorID int, name string) (pfAPI interface{}) {
 	}
 	return pfAPI
 }
+
+func (a *APIManager) GetAppOrgCodeList(vendorID int) (appOrgCodeList []string) {
+	switch vendorID {
+	case model.VendorIDJD:
+		appOrgCodeList = []string{"320406"}
+	case model.VendorIDMTWM:
+	case model.VendorIDEBAI:
+	}
+	return appOrgCodeList
+}
+
+func (a *APIManager) GetVendorOrgCodeList(vendorIDs []int, appOrgCodes []string) (vendorOrgCodeList []*VendorOrgCodePair) {
+	if len(vendorIDs) == 0 {
+		vendorIDs = partner.GetMultiStoreVendorIDs()
+	}
+	appOrgCodeMap := jxutils.StringList2Map(appOrgCodes)
+	for _, vendorID := range vendorIDs {
+		tmpOrgCodeList := a.GetAppOrgCodeList(vendorID)
+		for _, v := range tmpOrgCodeList {
+			if len(appOrgCodes) == 0 || appOrgCodeMap[v] == 1 {
+				vendorOrgCodeList = append(vendorOrgCodeList, &VendorOrgCodePair{
+					VendorID:   vendorID,
+					AppOrgCode: v,
+				})
+			}
+		}
+	}
+	return vendorOrgCodeList
+}

globals/beegodb/beegodb.go

@@ -32,7 +32,7 @@ func Init() {
 	orm.RegisterModel(&model.Store{}, &model.StoreSub{}, &model.StoreMap{}, &model.StoreCourierMap{})
 	orm.RegisterModel(&model.SkuVendorCategory{}, &model.StoreSkuCategoryMap{}, &model.SkuName{}, &model.Sku{}, &model.SkuNamePlaceBind{}, &model.StoreSkuBind{})
 	orm.RegisterModel(&model.SkuCategory{})
-	// orm.RegisterModel(&model.DurableTask{}, &model.DurableTaskItem{})
+	// orm.RegisterModel(&model.SkuCategoryMap{})
 
 	orm.RegisterModel(&model.AuthBind{}, &model.User{})
 

globals/globals.go

@@ -17,7 +17,6 @@ const (
 var (
 	ReallyCallPlatformAPI bool
 	ReallySendWeixinMsg   bool
-	ReallyReplyComment    bool
 
 	SugarLogger *zap.SugaredLogger
 
@@ -62,7 +61,6 @@ func Init() {
 	SugarLogger.Infof("globals RunMode=%s", beego.BConfig.RunMode)
 	ReallyCallPlatformAPI = (beego.BConfig.RunMode != "dev" && beego.BConfig.RunMode != "test")
 	ReallySendWeixinMsg = ReallyCallPlatformAPI && IsProductEnv()
-	ReallyReplyComment = ReallyCallPlatformAPI && IsProductEnv()
 
 	AliKey = beego.AppConfig.DefaultString("aliKey", "")
 	AliSecret = beego.AppConfig.DefaultString("aliSecret", "")
@@ -89,7 +87,7 @@ func Init() {
 	StoreName = beego.AppConfig.DefaultString("storeName", "京西菜市")
 
 	EnableWXAuth2 = true // beego.BConfig.RunMode == "beta"
-	DisableWXAuth1 = false
+	DisableWXAuth1 = true
 }
 
 func IsCallbackAlwaysReturnSuccess() bool {