1

business/jxcallback/scheduler/defsch/defsch.go

@@ -1515,7 +1515,7 @@ func (s *DefScheduler) updateBillsInfo(savedOrderInfo *WatchOrderInfo, bill *mod
 func (s *DefScheduler) autoPickupGood(savedOrderInfo *WatchOrderInfo) (err error) {
 	order := savedOrderInfo.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
 		partner.CurOrderManager.UpdateOrderFields(order, []string{"DeliveryFlag"})
 	} else if err == scheduler.ErrOrderStatusAlreadySatisfyCurOperation {

business/partner/purchase/tao_vegetable/order.go

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