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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-01-19 09:12:38 +08:00
parent e902e02fc3
commit bb2fab1ef3
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxcallback/scheduler/basesch/basesch_ext.go
View File

@@ -102,7 +102,8 @@ func (c *BaseScheduler) PickupGoodsAndUpdateStatus(ctx *jxcontext.Context, vendo
globals.SugarLogger.Infof("PickupGoodsAndUpdateStatus orderID:%s userName:%s", vendorOrderID, userName) globals.SugarLogger.Infof("PickupGoodsAndUpdateStatus orderID:%s userName:%s", vendorOrderID, userName)
order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID) order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID)
if err == nil { if err == nil {
err = c.PickupGoods(order, model.IsOrderDeliveryByStore(order), userName) flag := model.IsOrderDeliveryByStore(order) || model.IsOrderDeliveryBySelf(order)
err = c.PickupGoods(order, flag, userName)
if err == nil { if err == nil {
order.Status = model.OrderStatusFinishedPickup order.Status = model.OrderStatusFinishedPickup
if err = partner.CurOrderManager.UpdateOrderStatusAndDeliveryFlag(order); err == nil { if err = partner.CurOrderManager.UpdateOrderStatusAndDeliveryFlag(order); err == nil {

3
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -1325,7 +1325,8 @@ func (s *DefScheduler) updateBillsInfo(savedOrderInfo *WatchOrderInfo, bill *mod
func (s *DefScheduler) autoPickupGood(savedOrderInfo *WatchOrderInfo) (err error) { func (s *DefScheduler) autoPickupGood(savedOrderInfo *WatchOrderInfo) (err error) {
order := savedOrderInfo.order order := savedOrderInfo.order
if err = s.PickupGoods(order, model.IsOrderDeliveryByStore(order), ""); err == nil { flag := model.IsOrderDeliveryByStore(order) || model.IsOrderDeliveryBySelf(order)
if err = s.PickupGoods(order, flag, ""); err == nil {
order.DeliveryFlag |= model.OrderDeliveryFlagMaskAutoPickup order.DeliveryFlag |= model.OrderDeliveryFlagMaskAutoPickup
partner.CurOrderManager.UpdateOrderFields(order, []string{"DeliveryFlag"}) partner.CurOrderManager.UpdateOrderFields(order, []string{"DeliveryFlag"})
} else if err == scheduler.ErrOrderStatusAlreadySatisfyCurOperation { } else if err == scheduler.ErrOrderStatusAlreadySatisfyCurOperation {

5
business/model/order.go
View File

@@ -504,6 +504,11 @@ func IsOrderDeliveryByPlatform(order *GoodsOrder) bool {
return order.DeliveryType == OrderDeliveryTypePlatform return order.DeliveryType == OrderDeliveryTypePlatform
} }
//订单是否是自提单
func IsOrderDeliveryBySelf(order *GoodsOrder) bool {
return order.DeliveryType == OrderDeliveryTypeStoreSelf
}
func IsOrderJXTemp(order *GoodsOrder) bool { func IsOrderJXTemp(order *GoodsOrder) bool {
return order.VendorID == VendorIDJX && order.Flag&OrderFlagMaskTempJX != 0 return order.VendorID == VendorIDJX && order.Flag&OrderFlagMaskTempJX != 0
} }