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-02-02 12:37:04 +08:00
parent 7a5e4eedfd
commit 804d5e16d3
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/jxcallback/scheduler/defsch/defsch_ext.go
View File

@@ -46,7 +46,7 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
s.CancelAll3rdWaybills(ctx, vendorOrderID, vendorID, true) // 取消三方平台配送以及调度 s.CancelAll3rdWaybills(ctx, vendorOrderID, vendorID, true) // 取消三方平台配送以及调度
} }
} else { } else {
if order.Status < model.OrderStatusDelivering || (order.VendorID == model.VendorIDDD && order.Status < model.OrderStatusDelivering) { if order.Status < model.OrderStatusDelivering {
err = s.Swtich2SelfDeliver(order, userName) err = s.Swtich2SelfDeliver(order, userName)
} else if order.VendorID == order.WaybillVendorID { // 状态为配送中，且是购物平台运单，不能转自送了 } else if order.VendorID == order.WaybillVendorID { // 状态为配送中，且是购物平台运单，不能转自送了
err = scheduler.ErrOrderStatusIsNotSuitable4CurOperation err = scheduler.ErrOrderStatusIsNotSuitable4CurOperation
@@ -59,7 +59,7 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
order.DeliveryFlag |= model.OrderDeliveryFlagMaskScheduleDisabled | model.OrderDeliveryFlagMaskPurcahseDisabled order.DeliveryFlag |= model.OrderDeliveryFlagMaskScheduleDisabled | model.OrderDeliveryFlagMaskPurcahseDisabled
if err = partner.CurOrderManager.UpdateOrderStatusAndDeliveryFlag(order); err == nil { if err = partner.CurOrderManager.UpdateOrderStatusAndDeliveryFlag(order); err == nil {
s.stopTimer(savedOrderInfo) s.stopTimer(savedOrderInfo)
return err //return err
} }
} }
} else { } else {
@@ -71,7 +71,6 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
} }
vendorStatus := fmt.Sprintf("%s转商户自送成功", ctx.GetUserName()) vendorStatus := fmt.Sprintf("%s转商户自送成功", ctx.GetUserName())
remark := "" remark := ""
globals.SugarLogger.Debugf("==========err1 := %v", err)
if err != nil { if err != nil {
vendorStatus = fmt.Sprintf("%s转商户自送失败", ctx.GetUserName()) vendorStatus = fmt.Sprintf("%s转商户自送失败", ctx.GetUserName())
remark = err.Error() remark = err.Error()
@@ -113,9 +112,7 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
VendorOrgCode: order.VendorOrgCode, VendorOrgCode: order.VendorOrgCode,
} }
err = dao.CreateEntity(dao.GetDB(), bill) err = dao.CreateEntity(dao.GetDB(), bill)
globals.SugarLogger.Debugf("==========err1 := %v", err)
} }
globals.SugarLogger.Debugf("==========err2 := %v", err)
return err return err
}() }()
}, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID)) }, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID))

22
business/partner/purchase/tiktok_store/order.go
View File

@@ -597,17 +597,17 @@ func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName s
} }
//转门店自送通知抖音发货 //转门店自送通知抖音发货
//err = api.OrderDelivering(&order_logisticsAdd_request.OrderLogisticsAddParam{ err = api.OrderDelivering(&order_logisticsAdd_request.OrderLogisticsAddParam{
// OrderId: order.VendorOrderID, OrderId: order.VendorOrderID,
// Company: "", Company: "",
// CompanyCode: "chengdouruoxi", CompanyCode: "chengdouruoxi",
// LogisticsCode: order.VendorOrderID, LogisticsCode: order.VendorOrderID,
// IsRefundReject: false, IsRefundReject: false,
// IsRejectRefund: false, IsRejectRefund: false,
// SerialNumberList: nil, SerialNumberList: nil,
// AddressId: 0, AddressId: 0,
// StoreId: utils.Str2Int64(order.VendorStoreID), StoreId: utils.Str2Int64(order.VendorStoreID),
//}) })
return err return err
} }