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

- enable enableEbaiStoreWrite on prod

Browse Source 
- comment all ebai order write funcs.
This commit is contained in:
gazebo
2018-11-14 15:45:20 +08:00
parent 48f985a8be
commit d4810cc870
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
business/partner/purchase/ebai/order.go
View File

@@ -10,7 +10,6 @@ import (
"git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
) )
@@ -116,28 +115,28 @@ func (p *PurchaseHandler) GetOrder(vendorOrderID string) (order *model.GoodsOrde
} }
func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) { func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {
if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite { // if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
if isAcceptIt { // if isAcceptIt {
err = api.EbaiAPI.OrderConfirm(order.VendorOrderID) // err = api.EbaiAPI.OrderConfirm(order.VendorOrderID)
} else { // } else {
err = api.EbaiAPI.OrderCancel(order.VendorOrderID, ebaiapi.CancelTypeCustom, "bu") // err = api.EbaiAPI.OrderCancel(order.VendorOrderID, ebaiapi.CancelTypeCustom, "bu")
} // }
} // }
return err return err
} }
func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, userName string) (err error) { func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, userName string) (err error) {
if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite { // if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
err = api.EbaiAPI.OrderCallDelivery(order.VendorOrderID) // err = api.EbaiAPI.OrderCallDelivery(order.VendorOrderID)
} // }
return err return err
} }
// 将订单从购物平台配送转为自送 // 将订单从购物平台配送转为自送
func (p *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) { func (p *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) {
if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite { // if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
err = api.EbaiAPI.OrderSwitchselfdelivery(order.VendorOrderID) // err = api.EbaiAPI.OrderSwitchselfdelivery(order.VendorOrderID)
} // }
return err return err
} }
@@ -149,17 +148,17 @@ func (p *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName
// 完全自送的门店表示开始配送 // 完全自送的门店表示开始配送
func (p *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) { func (p *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) {
if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite { // if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
err = api.EbaiAPI.OrderSendOut(order.VendorOrderID, userName) // err = api.EbaiAPI.OrderSendOut(order.VendorOrderID, userName)
} // }
return err return err
} }
// 完全自送的门店表示配送完成 // 完全自送的门店表示配送完成
func (p *PurchaseHandler) SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) { func (p *PurchaseHandler) SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) {
if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite { // if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
err = api.EbaiAPI.OrderComplete(order.VendorOrderID, userName) // err = api.EbaiAPI.OrderComplete(order.VendorOrderID, userName)
} // }
return err return err
} }
@@ -187,8 +186,7 @@ func (c *PurchaseHandler) onOrderNew(msg *ebaiapi.CallbackMsg) (response *ebaiap
} }
func (c *PurchaseHandler) callbackMsg2Status(msg *ebaiapi.CallbackMsg) *model.OrderStatus { func (c *PurchaseHandler) callbackMsg2Status(msg *ebaiapi.CallbackMsg) *model.OrderStatus {
body := msg.Body vendorStatus := utils.Int64ToStr(utils.MustInterface2Int64(msg.Body["status"]))
vendorStatus := utils.Int64ToStr(utils.MustInterface2Int64(body["status"]))
orderID := GetOrderIDFromMsg(msg) orderID := GetOrderIDFromMsg(msg)
orderStatus := &model.OrderStatus{ orderStatus := &model.OrderStatus{
VendorOrderID: orderID, VendorOrderID: orderID,
@@ -199,7 +197,7 @@ func (c *PurchaseHandler) callbackMsg2Status(msg *ebaiapi.CallbackMsg) *model.Or
VendorStatus: vendorStatus, VendorStatus: vendorStatus,
Status: c.GetStatusFromVendorStatus(vendorStatus), Status: c.GetStatusFromVendorStatus(vendorStatus),
StatusTime: utils.Timestamp2Time(msg.Timestamp), StatusTime: utils.Timestamp2Time(msg.Timestamp),
Remark: utils.Interface2String(body["reason"]), Remark: utils.Interface2String(msg.Body["reason"]),
} }
return orderStatus return orderStatus
} }

1
conf/app.conf
View File

@@ -82,6 +82,7 @@ weixinSecret = "6bbbed1443cc062c20a015a64c07a531"
dbConnectStr = "root:WebServer@1@tcp(db1.int.jxc4.com:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true" dbConnectStr = "root:WebServer@1@tcp(db1.int.jxc4.com:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true"
enableStoreWrite = true enableStoreWrite = true
enableEbaiStoreWrite = true
[prod2] [prod2]
httpport = 8082 httpport = 8082