diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go index 3a14201b3..18869ab37 100644 --- a/business/partner/purchase/mtwm/store.go +++ b/business/partner/purchase/mtwm/store.go @@ -170,7 +170,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin errList.AddErr(p.UpdateStoreStatus(jxcontext.AdminCtx, storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID, mergedStoreStatus)) } errList.AddErr(p.UpdateStoreOpTime(jxcontext.AdminCtx, storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID, storeDetail.GetOpTimeList())) - errList.AddErr(p.UpdateStoreBoxFee(jxcontext.AdminCtx, storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID)) + // errList.AddErr(p.UpdateStoreBoxFee(jxcontext.AdminCtx, storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID)) return errList.GetErrListAsOne() } diff --git a/conf/app.conf b/conf/app.conf index 76d3564e8..0e0940587 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -15,6 +15,11 @@ dadaAppSecret = "7f97d8f258b70b450f04e7ab274ed8f8" mtwmAppID = "589" mtwmSecret = "a81eb3df418d83d6a1a4b7c572156d2f" mtwmCallbackURL = "http://callback.jxc4.com" + +mtwmAppID2 = "5873" +mtwmSecret2 = "41c479790a76f86326f89e8048964739" +mtwmCallbackURL2 = "http://callback.jxc4.com" + # mtwmCookieStr = "_lxsdk_cuid=16ddced5e9a95-0a65869c427a14-48714616-15f900-16ddced5e9b2b; _hc.v=cfebbfd1-79a7-9823-d8df-77e59646cb34.1571369610; _lxsdk=16ddced5e9a95-0a65869c427a14-48714616-15f900-16ddced5e9b2b; uuid_update=true; uuid=7b28e71504f5414e382b.1579155871.1.0.0; device_uuid=!64dedf83-b510-4910-8a31-b2b13d0bdd73; pushToken=00kRvxlerO15kB0dJFWDwYuctAoe04xGMNd0r3BqvLUA*; acctId=57396785; brandId=-1; wmPoiId=-1; isOfflineSelfOpen=0; city_id=0; isChain=1; existBrandPoi=true; ignore_set_router_proxy=true; region_id=; region_version=0; newCategory=false; bsid=OyqgRLyV54i9JKP0zRCI9jPyXc4UBU-6KReDAkPIwSlljhb97JPyFUIXfYQvhlJb6G1erzHQKbvtZ2pSWOYDxQ; cityId=510100; provinceId=510000; city_location_id=0; location_id=0; igateApp=shangouepc; wpush_server_url=wss://wpush.meituan.com; token=0MScAPaSa57iwRpgpCmGLf21tiA4yU4Uy-nDZlv8wNWs*; shopCategory=food; set_info=%7B%22wmPoiId%22%3A-1%2C%22ignoreSetRouterProxy%22%3Atrue%7D; JSESSIONID=105dgww27nsy6yfp68q7wmcni; LX_SC_CONSTANT=c_shangou_online_e_znrurnrc; _lxsdk_s=17041b590ac-3d-689-a8c%7C%7C15" autonaviKey = "ef64f638f31e05cb7bde28790f7309fe" diff --git a/globals/api/api.go b/globals/api/api.go index aac87d0d2..0439d8562 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -61,6 +61,7 @@ var ( Ebai2API *ebaiapi.API MtwmAPI *mtwmapi.API + Mtwm2API *mtwmapi.API MtpsAPI *mtpsapi.API DadaAPI *dadaapi.API WeixinAPI *weixinapi.API // 微信公众号 @@ -152,6 +153,7 @@ func Init() { // if mtwmCookieStr := beego.AppConfig.DefaultString("mtwmCookieStr", ""); mtwmCookieStr != "" { // MtwmAPI.SetCookieWithStr(mtwmCookieStr) // } + Mtwm2API = mtwmapi.New(beego.AppConfig.String("mtwmAppID2"), beego.AppConfig.String("mtwmSecret2"), beego.AppConfig.String("mtwmCallbackURL2")) } else { MtwmAPI = nil } diff --git a/globals/api/apimanager/apimanager.go b/globals/api/apimanager/apimanager.go index 3580ee17b..901ca5c2d 100644 --- a/globals/api/apimanager/apimanager.go +++ b/globals/api/apimanager/apimanager.go @@ -44,6 +44,9 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{}) } case model.VendorIDMTWM: pfAPI = api.MtwmAPI + if appOrgCode == globals.Mtwm2Code { + pfAPI = api.Mtwm2API + } case model.VendorIDEBAI: pfAPI = api.EbaiAPI case model.VendorIDJDShop: diff --git a/globals/globals.go b/globals/globals.go index 15d4a930b..a052b07f5 100644 --- a/globals/globals.go +++ b/globals/globals.go @@ -65,6 +65,9 @@ var ( Jd3OrgCode string JdLoginName string + MtwmCode string + Mtwm2Code string + IsStoreSkuAct bool IsAddEvent bool @@ -142,6 +145,9 @@ func Init() { JdLoginName = beego.AppConfig.DefaultString("jdLoginName", "") IsAddEvent = beego.AppConfig.DefaultBool("addEvent", false) IsStoreSkuAct = !IsProductEnv() + + MtwmCode = beego.AppConfig.DefaultString("mtwmAppID", "") + Mtwm2Code = beego.AppConfig.DefaultString("mtwmAppID2", "") } func IsCallbackAlwaysReturnSuccess() bool {