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

1

Browse Source
This commit is contained in:
邹宗楠
2023-07-03 14:21:29 +08:00
parent deb4270101
commit 2c2d696627
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1515,7 +1515,7 @@ 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
flag := model.IsOrderDeliveryByStore(order) || model.IsOrderDeliveryBySelf(order) flag := model.IsOrderDeliveryByStore(order) || model.IsOrderDeliveryBySelf(order)
if err = s.PickupGoods(order, flag, ""); err == nil { if err = s.PickupGoods(order, flag, "autoPickup"); 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 {

2
business/partner/purchase/tao_vegetable/order.go
View File

@@ -490,7 +490,7 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
// PickupGoods 拣货 // PickupGoods 拣货
func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
if !isSelfDelivery { if isSelfDelivery {
param, err := orderStatusChangeNotice(order, tao_vegetable.OrderStatusPickedUp) param, err := orderStatusChangeNotice(order, tao_vegetable.OrderStatusPickedUp)
if err != nil { if err != nil {
return err return err