添加ebai

This commit is contained in:
邹宗楠
2023-04-18 13:50:02 +08:00
parent f3438dddc1
commit 79bd42ea73
8 changed files with 219 additions and 54 deletions

View File

@@ -94,7 +94,7 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
VendorWaybillID2: "",
WaybillVendorID: model.VendorJXFakeWL,
VendorOrderID: order.VendorOrderID,
OrderVendorID: model.VendorIDDD,
OrderVendorID: order.VendorID,
CourierName: courierName,
CourierMobile: courierMobile,
Status: model.OrderStatusNew,
@@ -108,7 +108,7 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
WaybillFinishedAt: utils.DefaultTimeValue,
StatusTime: timeNow.Add(randTime), // 下一状态时间
OriginalData: "",
Remark: "自定义物流单",
Remark: "自定义物流单(抖音/饿了么)",
VendorOrgCode: order.VendorOrgCode,
}
err = dao.CreateEntity(dao.GetDB(), bill)
@@ -130,9 +130,9 @@ func (s *DefScheduler) canOrderCreateWaybillNormally(order *model.GoodsOrder, sa
func (s *DefScheduler) isPossibleSwitch2SelfDelivery(order *model.GoodsOrder) (err error) {
//TODO 刷单用,之后不刷单了删除
if order.VendorID == model.VendorIDDD {
return nil
}
//if order.VendorID == model.VendorIDDD {
// return nil
//}
if model.IsOrderDeliveryByPlatform(order) {
if order.Status < model.OrderStatusFinishedPickup {