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

- enableElmStoreWrite

Browse Source
This commit is contained in:
gazebo
2018-11-14 15:42:58 +08:00
parent 0f8cb39ac3
commit 48f985a8be
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
business/partner/purchase/elm/order.go
View File

@@ -267,10 +267,12 @@ func (c *PurchaseHandler) GetStatusFromVendorStatus(vendorStatus string) int {
} }
func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) { func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {
if isAcceptIt { if globals.EnableElmStoreWrite {
err = api.ElmAPI.ConfirmOrder(order.VendorOrderID) if isAcceptIt {
} else { err = api.ElmAPI.ConfirmOrder(order.VendorOrderID)
err = api.ElmAPI.CancelOrder(order.VendorOrderID, elmapi.CancelOrderTypeOthers, "") } else {
err = api.ElmAPI.CancelOrder(order.VendorOrderID, elmapi.CancelOrderTypeOthers, "")
}
} }
return err 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) { 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 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) { 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) { 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 { func (c *PurchaseHandler) GetStatusActionTimeout(statusType, status int) time.Duration {

1
conf/app.conf
View File

@@ -17,6 +17,7 @@ autonaviKey = "4427170f870af2110becb8852d36ab08"
enableStore = true enableStore = true
enableStoreWrite = false enableStoreWrite = false
enableEbaiStoreWrite = false enableEbaiStoreWrite = false
enableElmStoreWrite = true
orderUseNewTable = true orderUseNewTable = true
aliKey = "LTAI6xJUGaP6WdMQ" aliKey = "LTAI6xJUGaP6WdMQ"

2
globals/globals.go
View File

@@ -26,6 +26,7 @@ var (
EnableStore bool EnableStore bool
EnableStoreWrite bool EnableStoreWrite bool
EnableEbaiStoreWrite bool EnableEbaiStoreWrite bool
EnableElmStoreWrite bool
OrderUseNewTable bool OrderUseNewTable bool
QiniuBucket string QiniuBucket string
@@ -54,6 +55,7 @@ func Init() {
EnableStore = beego.AppConfig.DefaultBool("enableStore", false) EnableStore = beego.AppConfig.DefaultBool("enableStore", false)
EnableStoreWrite = beego.AppConfig.DefaultBool("enableStoreWrite", false) EnableStoreWrite = beego.AppConfig.DefaultBool("enableStoreWrite", false)
EnableEbaiStoreWrite = beego.AppConfig.DefaultBool("enableEbaiStoreWrite", false) EnableEbaiStoreWrite = beego.AppConfig.DefaultBool("enableEbaiStoreWrite", false)
EnableElmStoreWrite = beego.AppConfig.DefaultBool("enableElmStoreWrite", false)
if EnableStore { if EnableStore {
OrderUseNewTable = beego.AppConfig.DefaultBool("orderUseNewTable", false) OrderUseNewTable = beego.AppConfig.DefaultBool("orderUseNewTable", false)