liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新京东账号

Browse Source
This commit is contained in:
苏尹岚
2020-09-15 15:43:59 +08:00
parent 53804ef40d
commit 4aa59cf6bc
6 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -15,7 +15,6 @@ import (
"git.rosy.net.cn/jx-callback/business/authz"
"git.rosy.net.cn/jx-callback/business/authz/autils"
"git.rosy.net.cn/jx-callback/business/jxutils/ddmsg"
"git.rosy.net.cn/jx-callback/business/partner/purchase/jdshop"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/jxutils/netprinter"
@@ -841,7 +840,7 @@ func (s *DefScheduler) solutionJdsOrder(bill *model.Waybill) (err error) {
// globals.SugarLogger.Errorf("京东商城订单自动转移失败！", err)
// }
// } else {
err = jdshop.CurPurchaseHandler.OrderExport(jxcontext.AdminCtx, bill.VendorOrderID, bill.VendorWaybillID, true)
// err = jdshop.CurPurchaseHandler.OrderExport(jxcontext.AdminCtx, bill.VendorOrderID, bill.VendorWaybillID, true)
// }
}
return err

1
business/partner/purchase/jdshop/order.go
View File

@@ -68,6 +68,7 @@ func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, "订单在京东商城已被取消！")
} else {
err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusFinishedPickup, "自动拣货完成")
err = p.OrderExport(jxcontext.AdminCtx, order.VendorOrderID, order.VendorWaybillID, true)
}
return err
}

15
conf/app.conf
View File

@@ -143,6 +143,11 @@ jd2Token = "29e0e567-c475-433a-aff0-37176ee8d8a7"
jd2AppKey = "7fb947624ff847ae94ff2f068cc99652"
jd2Secret = "1097abd7ef09427099b4922784af123a"
jd3OrgCode = "359459"
jd3Token = "5e2c0a60-4450-40c0-a1da-b560051251ea"
jd3AppKey = "21b627c23ea04c69b64b48d0b361213e"
jd3Secret = "51cd27a748e64c829b4b7f83f4844610"
elmIsProd = false
elmToken = "2d2b583447b04b6bba5a6f3faed3559b"
elmAppKey = "RwT214gAsS"
@@ -181,6 +186,11 @@ jd2Token = "29e0e567-c475-433a-aff0-37176ee8d8a7"
jd2AppKey = "7fb947624ff847ae94ff2f068cc99652"
jd2Secret = "1097abd7ef09427099b4922784af123a"
jd3OrgCode = "359459"
jd3Token = "5e2c0a60-4450-40c0-a1da-b560051251ea"
jd3AppKey = "21b627c23ea04c69b64b48d0b361213e"
jd3Secret = "51cd27a748e64c829b4b7f83f4844610"
jdEclpAccessToken = "bcb6201b5b3c45a0976dcda5e2dea8aejiwm"
jdEclpAppKey = "0D397F05CF11C51BCDCC81744680EBC3"
jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"
@@ -416,6 +426,11 @@ jd2Token = "29e0e567-c475-433a-aff0-37176ee8d8a7"
jd2AppKey = "7fb947624ff847ae94ff2f068cc99652"
jd2Secret = "1097abd7ef09427099b4922784af123a"
jd3OrgCode = "359459"
jd3Token = "5e2c0a60-4450-40c0-a1da-b560051251ea"
jd3AppKey = "21b627c23ea04c69b64b48d0b361213e"
jd3Secret = "51cd27a748e64c829b4b7f83f4844610"
jdEclpAccessToken = "bcb6201b5b3c45a0976dcda5e2dea8aejiwm"
jdEclpAppKey = "0D397F05CF11C51BCDCC81744680EBC3"
jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"

5
globals/api/api.go
View File

@@ -48,6 +48,7 @@ var (
JdPageAPI *jdapi.API
Jd2API *jdapi.API
Jd3API *jdapi.API
FakeJdAPI *jdapi.API
JdEclpAPI *jdeclpapi.API
JdShopAPI *jdshopapi.API
@@ -115,6 +116,10 @@ func Init() {
// Jd2API.SetJdCookie(beego.AppConfig.DefaultString("jd2StorePageCookie", ""))
}
if globals.Jd3OrgCode != "" {
Jd3API = jdapi.New(beego.AppConfig.String("jd3Token"), beego.AppConfig.String("jd3AppKey"), beego.AppConfig.String("jd3Secret"))
}
fakeJdToken := beego.AppConfig.DefaultString("fakeJdToken", "")
if fakeJdToken != "" {
FakeJdAPI = jdapi.NewFakeJD(fakeJdToken, beego.AppConfig.String("fakeJdBaseURL"))

4
globals/api/apimanager/apimanager.go
View File

@@ -39,6 +39,8 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{})
pfAPI = api.FakeJdAPI
} else if appOrgCode != "" && appOrgCode == globals.Jd2OrgCode {
pfAPI = api.Jd2API
} else if appOrgCode != "" && appOrgCode == globals.Jd3OrgCode {
pfAPI = api.Jd3API
}
case model.VendorIDMTWM:
pfAPI = api.MtwmAPI
@@ -52,7 +54,7 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{})
func (a *APIManager) GetAppOrgCodeList(vendorID int) (appOrgCodeList []string) {
switch vendorID {
case model.VendorIDJD:
appOrgCodeList = jxutils.BatchString2Slice(globals.JdOrgCode, globals.Jd2OrgCode)
appOrgCodeList = jxutils.BatchString2Slice(globals.JdOrgCode, globals.Jd2OrgCode, globals.Jd3OrgCode)
case model.VendorIDMTWM:
appOrgCodeList = []string{api.MtwmAPI.GetAppID()}
case model.VendorIDEBAI:

2
globals/globals.go
View File

@@ -59,6 +59,7 @@ var (
JdOrgCode string
Jd2OrgCode string
Jd3OrgCode string
JdLoginName string
IsStoreSkuAct bool
@@ -131,6 +132,7 @@ func Init() {
TLPayNotifyURL = beego.AppConfig.DefaultString("tonglianPayNotifyURL", "")
JdOrgCode = beego.AppConfig.DefaultString("jdOrgCode", "")
Jd2OrgCode = beego.AppConfig.DefaultString("jd2OrgCode", "")
Jd3OrgCode = beego.AppConfig.DefaultString("jd3OrgCode", "")
JdLoginName = beego.AppConfig.DefaultString("jdLoginName", "")
IsAddEvent = beego.AppConfig.DefaultBool("addEvent", false)
IsStoreSkuAct = !IsProductEnv()