diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index bfd96d50c..126391571 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -1563,48 +1563,48 @@ func RefreshJdShopOrdersEarningPrice(ctx *jxcontext.Context, orderStartTime, ord if err != nil { return err } - var afsOrderList []map[*model.AfsOrder]float64 + //var afsOrderList []map[*model.AfsOrder]float64 if results != nil { for _, v := range results.BillList.Result { if v.DueAmount != 0 { order, _ := partner.CurOrderManager.LoadOrder(utils.Int64ToStr(v.OrderID), model.VendorIDJD) //可能是物竞天择的售后单 - if order == nil { - if afsOrder, _ := partner.CurOrderManager.LoadAfsOrder(utils.Int64ToStr(v.OrderID), model.VendorIDJD); afsOrder != nil { - var afsOrderMap = make(map[*model.AfsOrder]float64) - afsOrderMap[afsOrder] = v.DueAmount - afsOrderList = append(afsOrderList, afsOrderMap) - } else { - continue - } - } - store, _ := dao.GetStoreDetail(db, jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, order.VendorOrgCode) - // stores, _ := dao.GetStoreList(db, []int{jxutils.GetSaleStoreIDFromOrder(order)}, nil, nil, nil, nil, "") - if store != nil { - if order.TotalShopMoney == 0 { - order.TotalShopMoney = utils.Float64TwoInt64(v.DueAmount * 100) - } - if order.NewEarningPrice == 0 { - jxutils.RefreshOrderEarningPrice2(order, store.PayPercentage) - } - dao.UpdateEntity(db, order, "TotalShopMoney", "NewEarningPrice") - } - } - } - } - if len(afsOrderList) > 0 { - for i := len(afsOrderList) - 1; i < 0; i-- { - afsOrderMap := afsOrderList[i] - for k, v := range afsOrderMap { - if order2, _ := partner.CurOrderManager.LoadOrder(k.VendorOrderID, model.VendorIDJD); order2 != nil { - if k.AfsTotalShopMoney == 0 && order2.TotalShopMoney != 0 { - k.AfsTotalShopMoney = order2.TotalShopMoney - utils.Float64TwoInt64(v*100) - dao.UpdateEntity(db, k, "AfsTotalShopMoney") + if order != nil { + //if afsOrder, _ := partner.CurOrderManager.LoadAfsOrder(utils.Int64ToStr(v.OrderID), model.VendorIDJD); afsOrder != nil { + // var afsOrderMap = make(map[*model.AfsOrder]float64) + // afsOrderMap[afsOrder] = v.DueAmount + // afsOrderList = append(afsOrderList, afsOrderMap) + //} else { + // continue + //} + store, _ := dao.GetStoreDetail(db, jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, order.VendorOrgCode) + // stores, _ := dao.GetStoreList(db, []int{jxutils.GetSaleStoreIDFromOrder(order)}, nil, nil, nil, nil, "") + if store != nil { + if order.TotalShopMoney == 0 { + order.TotalShopMoney = utils.Float64TwoInt64(v.DueAmount * 100) + } + if order.NewEarningPrice == 0 { + jxutils.RefreshOrderEarningPrice2(order, store.PayPercentage) + } + dao.UpdateEntity(db, order, "TotalShopMoney", "NewEarningPrice") } } } } } + //if len(afsOrderList) > 0 { + // for i := len(afsOrderList) - 1; i < 0; i-- { + // afsOrderMap := afsOrderList[i] + // for k, v := range afsOrderMap { + // if order2, _ := partner.CurOrderManager.LoadOrder(k.VendorOrderID, model.VendorIDJD); order2 != nil { + // if k.AfsTotalShopMoney == 0 && order2.TotalShopMoney != 0 { + // k.AfsTotalShopMoney = order2.TotalShopMoney - utils.Float64TwoInt64(v*100) + // dao.UpdateEntity(db, k, "AfsTotalShopMoney") + // } + // } + // } + // } + //} return err }