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

物料订单分包测试

Browse Source
This commit is contained in:
苏尹岚
2020-03-16 15:31:03 +08:00
parent 7f9a6a6484
commit f0a5097655
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/partner/purchase/jx/localjx/order.go
View File

@@ -820,6 +820,7 @@ func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
} }
order.EclpOutID = result order.EclpOutID = result
dao.UpdateEntity(db, order, "EclpOutID") dao.UpdateEntity(db, order, "EclpOutID")
globals.SugarLogger.Debugf("tryToSplitMatterOrderaaa,[%v]", utils.Format4Output(order, false))
waybill := &model.Waybill{ waybill := &model.Waybill{
VendorOrderID: order.VendorOrderID, VendorOrderID: order.VendorOrderID,
OrderVendorID: model.VendorIDJX, OrderVendorID: model.VendorIDJX,
@@ -847,20 +848,16 @@ func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
jxOrder.Skus = skus jxOrder.Skus = skus
outOrders, _, _ := tryToSplitMatterOrder(jxOrder) outOrders, _, _ := tryToSplitMatterOrder(jxOrder)
for k, v := range outOrders { for k, v := range outOrders {
globals.SugarLogger.Debugf("tryToSplitMatterOrder6,[%v]", utils.Format4Output(v, false))
outJxOrder, deliveryAddress, err := generateOrder(jxcontext.AdminCtx, v, order.AddressID, order.FromStoreID, order.UserID) outJxOrder, deliveryAddress, err := generateOrder(jxcontext.AdminCtx, v, order.AddressID, order.FromStoreID, order.UserID)
if err != nil { if err != nil {
globals.SugarLogger.Debugf("tryToSplitMatterOrder10,[%v]", err)
return err return err
} }
outJxOrder.OrderID = utils.Str2Int64(order.VendorOrderID)*100 + int64(k+1) outJxOrder.OrderID = utils.Str2Int64(order.VendorOrderID)*100 + int64(k+1)
globals.SugarLogger.Debugf("tryToSplitMatterOrder7,[%v]", utils.Format4Output(outJxOrder, false))
order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress) order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress)
if err = err2; err == nil { if err = err2; err == nil {
order2.AddressID = order.AddressID order2.AddressID = order.AddressID
order2.Status = model.OrderStatusDelivering order2.Status = model.OrderStatusDelivering
globals.SugarLogger.Debugf("tryToSplitMatterOrder8,[%v]", utils.Format4Output(order2, false)) err = partner.CurOrderManager.OnOrderNew(order2, model.Order2Status(order2))
err = partner.CurOrderManager.OnOrderNew(order, model.Order2Status(order))
orderSolutionForWuLiao(order2) orderSolutionForWuLiao(order2)
} }
} }