diff --git a/business/partner/purchase/weimob/wsc/order.go b/business/partner/purchase/weimob/wsc/order.go index 33e3ac08a..4ea4a48b9 100644 --- a/business/partner/purchase/weimob/wsc/order.go +++ b/business/partner/purchase/weimob/wsc/order.go @@ -169,8 +169,9 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo } func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) { + globals.SugarLogger.Debugf("wsc AcceptOrRefuseOrder orderID:%s, isAcceptIt:%t", order.VendorOrderID, isAcceptIt) if !isAcceptIt { - if globals.EnableStoreWrite && globals.EnableWscStoreWrite { + if globals.EnableWscStoreWrite { err = api.WeimobAPI.CancelOrder(utils.Str2Int64(order.VendorOrderID), "") } } else { @@ -179,7 +180,7 @@ func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI p.postFakeMsg(utils.Str2Int64(order.VendorOrderID), FakeOrderStatusAccepted) } else { globals.SugarLogger.Debugf("weimob AcceptOrRefuseOrder orderID:%s can not find sale store", order.VendorOrderID) - if globals.EnableStoreWrite && globals.EnableWscStoreWrite { + if globals.EnableWscStoreWrite { err = api.WeimobAPI.CancelOrder(utils.Str2Int64(order.VendorOrderID), "没有找到合适的配送店") } } @@ -188,7 +189,8 @@ func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI } func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { - if globals.EnableStoreWrite && globals.EnableWscStoreWrite && !isSelfDelivery { + globals.SugarLogger.Debugf("wsc PickupGoods orderID:%s, isSelfDelivery:%t", order.VendorOrderID, isSelfDelivery) + if globals.EnableWscStoreWrite && !isSelfDelivery { _, err = dada.CurDeliveryHandler.CreateWaybill(order, delivery.DefCreateWaybillPolicy) } // 微商城没有拣货完成,模拟 @@ -198,7 +200,8 @@ func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo // 将订单从购物平台配送转为自送 func (p *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) { - if globals.EnableStoreWrite && globals.EnableWscStoreWrite { + globals.SugarLogger.Debugf("wsc Swtich2SelfDeliver orderID:%s", order.VendorOrderID) + if globals.EnableWscStoreWrite { err = api.WeimobAPI.DeliveryOrder(&weimobapi.DeliveryOrder{ OrderNo: utils.Str2Int64(order.VendorOrderID), }) @@ -208,12 +211,14 @@ func (p *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName s // 将订单从购物平台配送转为自送后又送达 func (p *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName string) (err error) { + globals.SugarLogger.Debugf("wsc Swtich2SelfDelivered orderID:%s", order.VendorOrderID) return err } // 完全自送的门店表示开始配送 func (p *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) { - if globals.EnableStoreWrite && globals.EnableWscStoreWrite { + globals.SugarLogger.Debugf("wsc SelfDeliverDelivering orderID:%s", order.VendorOrderID) + if globals.EnableWscStoreWrite { err = api.WeimobAPI.DeliveryOrder(&weimobapi.DeliveryOrder{ OrderNo: utils.Str2Int64(order.VendorOrderID), }) @@ -223,6 +228,7 @@ func (p *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam // 完全自送的门店表示配送完成 func (p *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) { + globals.SugarLogger.Debugf("wsc SelfDeliverDelivered orderID:%s", order.VendorOrderID) return err }