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-10 11:48:50 +08:00
parent 904e360de2
commit b53ff7f049
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1514,7 +1514,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
flag := model.IsOrderDeliveryByStore(order) || model.IsOrderDeliveryBySelf(order) store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, "")
flag := (model.IsOrderDeliveryByStore(order) || model.IsOrderDeliveryBySelf(order)) && store.AutoPickup == model.YES
if err = s.PickupGoods(order, flag, "autoPickup"); 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"})

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

@@ -494,8 +494,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) {
store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, model.VendorIDTaoVegetable, "") if isSelfDelivery {
if isSelfDelivery && store.AutoPickup == model.YES {
param, err := orderStatusChangeNotice(order, tao_vegetable.OrderStatusPickedUp) param, err := orderStatusChangeNotice(order, tao_vegetable.OrderStatusPickedUp)
if err != nil { if err != nil {
return err return err
@@ -712,6 +711,7 @@ func (c *PurchaseHandler) AdjustOrder(ctx *jxcontext.Context, order *model.Goods
if refundSkuOrderID[utils.Str2Int(*v.SkuCode)] == model.YES { if refundSkuOrderID[utils.Str2Int(*v.SkuCode)] == model.YES {
continue continue
} }
workCallbackSubOrderInfo := domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo{ workCallbackSubOrderInfo := domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo{
BizSubOrderId: v.BizSubOrderId, BizSubOrderId: v.BizSubOrderId,
SkuCode: v.SkuCode, SkuCode: v.SkuCode,