diff --git a/business/partner/purchase/ebai/callback.go b/business/partner/purchase/ebai/callback.go index a86dc8fa5..aa283022d 100644 --- a/business/partner/purchase/ebai/callback.go +++ b/business/partner/purchase/ebai/callback.go @@ -8,22 +8,24 @@ import ( ) func OnCallbackMsg(msg *ebaiapi.CallbackMsg) (response *ebaiapi.CallbackResponse) { - if orderID := GetOrderIDFromMsg(msg); orderID != "" { - jxutils.CallMsgHandler(func() { - switch msg.Cmd { - case ebaiapi.CmdOrderCreate, ebaiapi.CmdOrderStatus, ebaiapi.CmdOrderUserCancel, ebaiapi.CmdOrderPartRefund: - response = CurPurchaseHandler.onOrderMsg(msg) - case ebaiapi.CmdOrderDeliveryStatus: - response = CurPurchaseHandler.onWaybillMsg(msg) - } - }, jxutils.ComposeUniversalOrderID(orderID, model.VendorIDEBAI)) - } - if msg.Cmd == ebaiapi.CmdOrderPartRefund || msg.Cmd == ebaiapi.CmdOrderUserCancel || msg.Cmd == ebaiapi.CmdOrderDeliveryStatus { - utils.CallFuncAsync(func() { - OnFinancialMsg(msg) - }) - } else if msg.Cmd == ebaiapi.CmdShopMsgPush { - response = CurPurchaseHandler.onShopMsgPush(msg) + if CurPurchaseHandler != nil { + if orderID := GetOrderIDFromMsg(msg); orderID != "" { + jxutils.CallMsgHandler(func() { + switch msg.Cmd { + case ebaiapi.CmdOrderCreate, ebaiapi.CmdOrderStatus, ebaiapi.CmdOrderUserCancel, ebaiapi.CmdOrderPartRefund: + response = CurPurchaseHandler.onOrderMsg(msg) + case ebaiapi.CmdOrderDeliveryStatus: + response = CurPurchaseHandler.onWaybillMsg(msg) + } + }, jxutils.ComposeUniversalOrderID(orderID, model.VendorIDEBAI)) + } + if msg.Cmd == ebaiapi.CmdOrderPartRefund || msg.Cmd == ebaiapi.CmdOrderUserCancel || msg.Cmd == ebaiapi.CmdOrderDeliveryStatus { + utils.CallFuncAsync(func() { + OnFinancialMsg(msg) + }) + } else if msg.Cmd == ebaiapi.CmdShopMsgPush { + response = CurPurchaseHandler.onShopMsgPush(msg) + } } return response } diff --git a/business/partner/purchase/ebai/ebai.go b/business/partner/purchase/ebai/ebai.go index 47f1de961..6dabb5db1 100644 --- a/business/partner/purchase/ebai/ebai.go +++ b/business/partner/purchase/ebai/ebai.go @@ -19,8 +19,10 @@ type PurchaseHandler struct { } func init() { - CurPurchaseHandler = new(PurchaseHandler) - partner.RegisterPurchasePlatform(CurPurchaseHandler) + if api.EbaiAPI != nil { + CurPurchaseHandler = new(PurchaseHandler) + partner.RegisterPurchasePlatform(CurPurchaseHandler) + } } func EbaiBusStatus2JxStatus(ebaiStatus int) int { diff --git a/business/partner/purchase/elm/elm.go b/business/partner/purchase/elm/elm.go index 22424e974..8953ded51 100644 --- a/business/partner/purchase/elm/elm.go +++ b/business/partner/purchase/elm/elm.go @@ -9,6 +9,7 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/partner" + "git.rosy.net.cn/jx-callback/globals/api" ) var ( @@ -20,8 +21,10 @@ type PurchaseHandler struct { } func init() { - curPurchaseHandler = new(PurchaseHandler) - partner.RegisterPurchasePlatform(curPurchaseHandler) + if api.ElmAPI != nil { + curPurchaseHandler = new(PurchaseHandler) + partner.RegisterPurchasePlatform(curPurchaseHandler) + } } func (c *PurchaseHandler) GetVendorID() int { @@ -29,7 +32,10 @@ func (c *PurchaseHandler) GetVendorID() int { } func OnCallbackMsg(msg *elmapi.CallbackMsg) (retVal *elmapi.CallbackResponse) { - return curPurchaseHandler.OnCallbackMsg(msg) + if curPurchaseHandler != nil { + retVal = curPurchaseHandler.OnCallbackMsg(msg) + } + return retVal } func (c *PurchaseHandler) OnCallbackMsg(msg *elmapi.CallbackMsg) (retVal *elmapi.CallbackResponse) { diff --git a/business/partner/purchase/jd/callback.go b/business/partner/purchase/jd/callback.go index 89858dc8e..cf1d8c55f 100644 --- a/business/partner/purchase/jd/callback.go +++ b/business/partner/purchase/jd/callback.go @@ -8,26 +8,35 @@ import ( ) func OnOrderMsg(msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) { - if retVal = curPurchaseHandler.OnOrderMsg(msg); retVal == nil { - retVal = jdapi.Err2CallbackResponse(errors.New("Internal Error"), "") + if curPurchaseHandler != nil { + if retVal = curPurchaseHandler.OnOrderMsg(msg); retVal == nil { + retVal = jdapi.Err2CallbackResponse(errors.New("Internal Error"), "") + } } return retVal } func OnWaybillMsg(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *jdapi.CallbackResponse) { - if retVal = curPurchaseHandler.OnWaybillMsg(msg); retVal == nil { - retVal = jdapi.Err2CallbackResponse(errors.New("Internal Error"), "") + if curPurchaseHandler != nil { + if retVal = curPurchaseHandler.OnWaybillMsg(msg); retVal == nil { + retVal = jdapi.Err2CallbackResponse(errors.New("Internal Error"), "") + } } return retVal } func OnStoreMsg(msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) { - return curPurchaseHandler.onStoreMsg(msg) + if curPurchaseHandler != nil { + retVal = curPurchaseHandler.onStoreMsg(msg) + } + return retVal } func OnAfterSaleMsg(msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) { - utils.CallFuncAsync(func() { - OnFinancialMsg(msg) - }) + if curPurchaseHandler != nil { + utils.CallFuncAsync(func() { + OnFinancialMsg(msg) + }) + } return retVal } diff --git a/business/partner/purchase/jd/jd.go b/business/partner/purchase/jd/jd.go index 20abcad2b..45490f29a 100644 --- a/business/partner/purchase/jd/jd.go +++ b/business/partner/purchase/jd/jd.go @@ -5,6 +5,7 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/partner" + "git.rosy.net.cn/jx-callback/globals/api" ) var ( @@ -16,8 +17,10 @@ type PurchaseHandler struct { } func init() { - curPurchaseHandler = new(PurchaseHandler) - partner.RegisterPurchasePlatform(curPurchaseHandler) + if api.JdAPI != nil { + curPurchaseHandler = new(PurchaseHandler) + partner.RegisterPurchasePlatform(curPurchaseHandler) + } } func (c *PurchaseHandler) GetVendorID() int { diff --git a/business/partner/purchase/mtwm/callback.go b/business/partner/purchase/mtwm/callback.go index ab518848d..4bb0df4ee 100644 --- a/business/partner/purchase/mtwm/callback.go +++ b/business/partner/purchase/mtwm/callback.go @@ -8,22 +8,24 @@ import ( ) func OnOrderCallbackMsg(msg *mtwmapi.CallbackMsg) (response *mtwmapi.CallbackResponse) { - if orderID := GetOrderIDFromMsg(msg); orderID != "" { - jxutils.CallMsgHandler(func() { - switch msg.Cmd { - case mtwmapi.MsgTypeWaybillStatus: - response = curPurchaseHandler.onWaybillMsg(msg) - default: - response = curPurchaseHandler.onOrderMsg(msg) - } - }, jxutils.ComposeUniversalOrderID(orderID, model.VendorIDMTWM)) - } - if msg.Cmd == mtwmapi.MsgTypeOrderRefund || msg.Cmd == mtwmapi.MsgTypeOrderPartialRefund { - utils.CallFuncAsync(func() { - OnFinancialMsg(msg) - }) - } else if msg.Cmd == mtwmapi.MsgTypeStoreStatusChanged { - response = curPurchaseHandler.onStoreStatusChanged(msg) + if curPurchaseHandler != nil { + if orderID := GetOrderIDFromMsg(msg); orderID != "" { + jxutils.CallMsgHandler(func() { + switch msg.Cmd { + case mtwmapi.MsgTypeWaybillStatus: + response = curPurchaseHandler.onWaybillMsg(msg) + default: + response = curPurchaseHandler.onOrderMsg(msg) + } + }, jxutils.ComposeUniversalOrderID(orderID, model.VendorIDMTWM)) + } + if msg.Cmd == mtwmapi.MsgTypeOrderRefund || msg.Cmd == mtwmapi.MsgTypeOrderPartialRefund { + utils.CallFuncAsync(func() { + OnFinancialMsg(msg) + }) + } else if msg.Cmd == mtwmapi.MsgTypeStoreStatusChanged { + response = curPurchaseHandler.onStoreStatusChanged(msg) + } } return response } diff --git a/business/partner/purchase/mtwm/mtwm.go b/business/partner/purchase/mtwm/mtwm.go index 4287e7105..d26bcc6ec 100644 --- a/business/partner/purchase/mtwm/mtwm.go +++ b/business/partner/purchase/mtwm/mtwm.go @@ -22,8 +22,10 @@ type PurchaseHandler struct { } func init() { - curPurchaseHandler = new(PurchaseHandler) - partner.RegisterPurchasePlatform(curPurchaseHandler) + if api.MtwmAPI != nil { + curPurchaseHandler = new(PurchaseHandler) + partner.RegisterPurchasePlatform(curPurchaseHandler) + } } func (c *PurchaseHandler) GetVendorID() int { diff --git a/business/partner/purchase/weimob/wsc/callback.go b/business/partner/purchase/weimob/wsc/callback.go index 331611742..f1cccb9bd 100644 --- a/business/partner/purchase/weimob/wsc/callback.go +++ b/business/partner/purchase/weimob/wsc/callback.go @@ -8,9 +8,11 @@ import ( ) func OnCallbackMsg(msg *weimobapi.CallbackMsg) (response *weimobapi.CallbackResponse) { - orderID := utils.Int64ToStr(msg.OrderNo) - jxutils.CallMsgHandler(func() { - response = curPurchaseHandler.onOrderMsg(msg) - }, jxutils.ComposeUniversalOrderID(orderID, model.VendorIDWSC)) + if curPurchaseHandler != nil { + orderID := utils.Int64ToStr(msg.OrderNo) + jxutils.CallMsgHandler(func() { + response = curPurchaseHandler.onOrderMsg(msg) + }, jxutils.ComposeUniversalOrderID(orderID, model.VendorIDWSC)) + } return response } diff --git a/business/partner/purchase/weimob/wsc/wsc.go b/business/partner/purchase/weimob/wsc/wsc.go index 3b77d1013..c5bbc4e31 100644 --- a/business/partner/purchase/weimob/wsc/wsc.go +++ b/business/partner/purchase/weimob/wsc/wsc.go @@ -24,8 +24,10 @@ type PurchaseHandler struct { } func init() { - curPurchaseHandler = new(PurchaseHandler) - partner.RegisterPurchasePlatform(curPurchaseHandler) + if api.WeimobAPI != nil { + curPurchaseHandler = new(PurchaseHandler) + partner.RegisterPurchasePlatform(curPurchaseHandler) + } } func (c *PurchaseHandler) GetVendorID() int { diff --git a/conf/app.conf b/conf/app.conf index cb2ffd3fa..853d21626 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -105,6 +105,8 @@ weixinToken = "17_roSCZgkCxhRnyFVtei0KdfHwdGP8PmLzJFhCieka4_X4_d-lgfaTxF6oIS6FE5 dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true" [prod] +EnableDocs = false + jdToken = "ccb10daf-e6f5-4a58-ada5-b97f9073a137" jdAppKey = "1dba76d40cac446ca500c0391a0b6c9d" jdSecret = "a88d031a1e7b462cb1579f12e97fe7f4" @@ -143,6 +145,9 @@ dingdingSecret = "LWrZAFeqUfuVv7n_tc8vPpCAx6PT4CwManx2XCVhJOqGsx2L5XCDuX1sAN_Jtv dingdingCallbackURL = "http://callback.jxc4.com/dingding/msg" [jxgy] +httpport = 8088 +EnableDocs = false + dbConnectStr = "root:WebServer@1@tcp(db1.int.jxc4.com:3306)/jxgy?charset=utf8mb4&loc=Local&parseTime=true" jdToken = "b9f98667-9856-45e9-a31c-9a8862b1bfde"