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

提交订单

Browse Source
This commit is contained in:
邹宗楠
2022-03-09 14:52:21 +08:00
parent 19fed7f0aa
commit cff4e7fb01
6 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxcallback/orderman/waybill.go
View File

@@ -138,6 +138,7 @@ func (w *OrderManager) OnWaybillStatusChanged(bill *model.Waybill) (err error) {
} }
dao.Commit(db, txDB) dao.Commit(db, txDB)
// 进运单调度器OnWaybillStatusChanged之前要确保事务是提交了的，否则会导致死锁 // 进运单调度器OnWaybillStatusChanged之前要确保事务是提交了的，否则会导致死锁
// 加载数据到当前系统调度器当中
scheduler.CurrentScheduler.OnWaybillStatusChanged(&billCopy, false) scheduler.CurrentScheduler.OnWaybillStatusChanged(&billCopy, false)
dao.Begin(db) dao.Begin(db)
} else { } else {

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

@@ -162,7 +162,7 @@ func (c *BaseScheduler) CreateWaybill(platformVendorID int, order *model.GoodsOr
} }
// if order.DeliveryFlag&model.OrderDeliveryFlagMaskScheduleDisabled != 0 { // if order.DeliveryFlag&model.OrderDeliveryFlagMaskScheduleDisabled != 0 {
// waybillList, err := partner.CurOrderManager.GetOrderWaybillInfo(jxcontext.AdminCtx, order.VendorOrderID, order.VendorID, true) // waybillList, err := partner.CurOrderManager.GetOrderWaybillInfo(jxcontext.AdminCtx, order.VendorOrderID, order.VendorID, true)
// if err != nil {1 // if err != nil {
// return nil, err // return nil, err
// } // }
// if len(waybillList) > 0 { // if len(waybillList) > 0 {

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

@@ -504,7 +504,7 @@ func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *mod
return err return err
} }
// 以下是运单 // 以下是运单 (将订单数据放入系统内部调度器当中)
func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending bool) (err error) { func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending bool) (err error) {
if bill.Status > model.WaybillStatusUnknown { if bill.Status > model.WaybillStatusUnknown {
globals.SugarLogger.Debugf("OnWaybillStatusChanged orderID:%s %s, bill:%v", bill.VendorOrderID, model.WaybillStatusName[bill.Status], utils.Format4Output(bill, true)) globals.SugarLogger.Debugf("OnWaybillStatusChanged orderID:%s %s, bill:%v", bill.VendorOrderID, model.WaybillStatusName[bill.Status], utils.Format4Output(bill, true))

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

@@ -207,6 +207,7 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor
if vendorID == model.VendorIDELM { if vendorID == model.VendorIDELM {
return nil, fmt.Errorf("不要直接使用饿了么订单号，请使用相应的饿百订单号") return nil, fmt.Errorf("不要直接使用饿了么订单号，请使用相应的饿百订单号")
} }
// 创建可调度对象,并且存储
savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, true) savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, true)
if savedOrderInfo != nil { if savedOrderInfo != nil {
order := savedOrderInfo.order order := savedOrderInfo.order

8
business/partner/delivery/mtps/waybill.go
View File

@@ -120,6 +120,7 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
c.pushToGy(msg) c.pushToGy(msg)
return mtpsapi.SuccessResponse return mtpsapi.SuccessResponse
} }
// 加入调度器
return mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus) return mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus)
} }
@@ -207,10 +208,15 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
deliveryFeeInfo = &partner.WaybillFeeInfo{} deliveryFeeInfo = &partner.WaybillFeeInfo{}
// 获取送货单id // 获取送货单id
deliveryID := c.getDeliveryID(order) deliveryID := c.getDeliveryID(order)
shopId, err := c.getMTPSShopID(order, dao.GetDB())
if err != nil {
return nil, err
}
deliveryFeeInfo.RefDeliveryFee, deliveryFeeInfo.RefAddFee, err = api.MtpsAPI.PreCreateByShop(&mtpsapi.PreCreateByShopParam{ deliveryFeeInfo.RefDeliveryFee, deliveryFeeInfo.RefAddFee, err = api.MtpsAPI.PreCreateByShop(&mtpsapi.PreCreateByShopParam{
DeliveryID: deliveryID, DeliveryID: deliveryID,
OrderID: order.VendorOrderID, OrderID: order.VendorOrderID,
ShopID: utils.Int2Str(order.StoreID), ShopID: shopId,
DeliveryServiceCode: mtpsapi.DeliveryServiceCodeRapid, DeliveryServiceCode: mtpsapi.DeliveryServiceCodeRapid,
ReceiverName: order.ConsigneeName, ReceiverName: order.ConsigneeName,
ReceiverAddress: order.ConsigneeAddress, ReceiverAddress: order.ConsigneeAddress,

1
controllers/jx_order.go
View File

@@ -109,7 +109,6 @@ func (c *OrderController) QueryOrderWaybillFeeInfo() {
}) })
} }
// todo 召唤第三方骑手配送生成订单
// @Title 创建三方运单 // @Title 创建三方运单
// @Description 创建三方运单 // @Description 创建三方运单
// @Param token header string true "认证token" // @Param token header string true "认证token"