diff --git a/business/partner/purchase/elm/order.go b/business/partner/purchase/elm/order.go index 21ac0a876..8e129de1d 100644 --- a/business/partner/purchase/elm/order.go +++ b/business/partner/purchase/elm/order.go @@ -267,10 +267,12 @@ func (c *PurchaseHandler) GetStatusFromVendorStatus(vendorStatus string) int { } func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) { - if isAcceptIt { - err = api.ElmAPI.ConfirmOrder(order.VendorOrderID) - } else { - err = api.ElmAPI.CancelOrder(order.VendorOrderID, elmapi.CancelOrderTypeOthers, "") + if globals.EnableElmStoreWrite { + if isAcceptIt { + err = api.ElmAPI.ConfirmOrder(order.VendorOrderID) + } else { + err = api.ElmAPI.CancelOrder(order.VendorOrderID, elmapi.CancelOrderTypeOthers, "") + } } return err } @@ -282,7 +284,9 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, userName string) } func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) { - err = api.ElmAPI.DeliveryBySelfLite(order.VendorOrderID) + if globals.EnableElmStoreWrite { + err = api.ElmAPI.DeliveryBySelfLite(order.VendorOrderID) + } return err } @@ -292,11 +296,17 @@ func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName } func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) { - return api.ElmAPI.StartDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile) + if globals.EnableElmStoreWrite { + err = api.ElmAPI.StartDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile) + } + return err } func (c *PurchaseHandler) SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) { - return api.ElmAPI.CompleteDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile) + if globals.EnableElmStoreWrite { + err = api.ElmAPI.CompleteDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile) + } + return err } func (c *PurchaseHandler) GetStatusActionTimeout(statusType, status int) time.Duration { diff --git a/conf/app.conf b/conf/app.conf index a93fc55c6..78d211840 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -17,6 +17,7 @@ autonaviKey = "4427170f870af2110becb8852d36ab08" enableStore = true enableStoreWrite = false enableEbaiStoreWrite = false +enableElmStoreWrite = true orderUseNewTable = true aliKey = "LTAI6xJUGaP6WdMQ" diff --git a/globals/globals.go b/globals/globals.go index 7d731e521..f7f11b38c 100644 --- a/globals/globals.go +++ b/globals/globals.go @@ -26,6 +26,7 @@ var ( EnableStore bool EnableStoreWrite bool EnableEbaiStoreWrite bool + EnableElmStoreWrite bool OrderUseNewTable bool QiniuBucket string @@ -54,6 +55,7 @@ func Init() { EnableStore = beego.AppConfig.DefaultBool("enableStore", false) EnableStoreWrite = beego.AppConfig.DefaultBool("enableStoreWrite", false) EnableEbaiStoreWrite = beego.AppConfig.DefaultBool("enableEbaiStoreWrite", false) + EnableElmStoreWrite = beego.AppConfig.DefaultBool("enableElmStoreWrite", false) if EnableStore { OrderUseNewTable = beego.AppConfig.DefaultBool("orderUseNewTable", false)