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:42:05 +08:00
parent f0a5097655
commit 942fac44e8
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -833,34 +833,34 @@ func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
}
dao.CreateEntity(db, waybill)
} else { //如果重量超过5kg则需要进行拆单分包，商品分包规则。最后一个包不超过5kg,其他包不超过3kg
jxOrder := &JxOrderInfo{}
jxOrder.StoreID = order.StoreID
var skus []*JxSkuInfo
for _, v := range orderSkus {
sku := &JxSkuInfo{}
sku.SkuID = v.SkuID
sku.SalePrice = v.SalePrice
sku.Name = v.SkuName
sku.Weight = v.Weight
sku.Count = v.Count
skus = append(skus, sku)
}
jxOrder.Skus = skus
outOrders, _, _ := tryToSplitMatterOrder(jxOrder)
for k, v := range outOrders {
outJxOrder, deliveryAddress, err := generateOrder(jxcontext.AdminCtx, v, order.AddressID, order.FromStoreID, order.UserID)
if err != nil {
return err
}
outJxOrder.OrderID = utils.Str2Int64(order.VendorOrderID)*100 + int64(k+1)
order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress)
if err = err2; err == nil {
order2.AddressID = order.AddressID
order2.Status = model.OrderStatusDelivering
err = partner.CurOrderManager.OnOrderNew(order2, model.Order2Status(order2))
orderSolutionForWuLiao(order2)
}
}
// jxOrder := &JxOrderInfo{}
// jxOrder.StoreID = order.StoreID
// var skus []*JxSkuInfo
// for _, v := range orderSkus {
// sku := &JxSkuInfo{}
// sku.SkuID = v.SkuID
// sku.SalePrice = v.SalePrice
// sku.Name = v.SkuName
// sku.Weight = v.Weight
// sku.Count = v.Count
// skus = append(skus, sku)
// }
// jxOrder.Skus = skus
// outOrders, _, _ := tryToSplitMatterOrder(jxOrder)
// for k, v := range outOrders {
// outJxOrder, deliveryAddress, err := generateOrder(jxcontext.AdminCtx, v, order.AddressID, order.FromStoreID, order.UserID)
// if err != nil {
// return err
// }
// outJxOrder.OrderID = utils.Str2Int64(order.VendorOrderID)*100 + int64(k+1)
// order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress)
// if err = err2; err == nil {
// order2.AddressID = order.AddressID
// order2.Status = model.OrderStatusDelivering
// err = partner.CurOrderManager.OnOrderNew(order2, model.Order2Status(order2))
// orderSolutionForWuLiao(order2)
// }
// }
//刷新一下库存
for _, v := range goods[0].Skus {
cms.RefreshMatterStock(jxcontext.AdminCtx, v.SkuID)