This commit is contained in:
suyl
2021-09-14 14:09:08 +08:00
parent 43d9568d61
commit 20433d4970

View File

@@ -1563,48 +1563,48 @@ func RefreshJdShopOrdersEarningPrice(ctx *jxcontext.Context, orderStartTime, ord
if err != nil { if err != nil {
return err return err
} }
var afsOrderList []map[*model.AfsOrder]float64 //var afsOrderList []map[*model.AfsOrder]float64
if results != nil { if results != nil {
for _, v := range results.BillList.Result { for _, v := range results.BillList.Result {
if v.DueAmount != 0 { if v.DueAmount != 0 {
order, _ := partner.CurOrderManager.LoadOrder(utils.Int64ToStr(v.OrderID), model.VendorIDJD) order, _ := partner.CurOrderManager.LoadOrder(utils.Int64ToStr(v.OrderID), model.VendorIDJD)
//可能是物竞天择的售后单 //可能是物竞天择的售后单
if order == nil { if order != nil {
if afsOrder, _ := partner.CurOrderManager.LoadAfsOrder(utils.Int64ToStr(v.OrderID), model.VendorIDJD); afsOrder != nil { //if afsOrder, _ := partner.CurOrderManager.LoadAfsOrder(utils.Int64ToStr(v.OrderID), model.VendorIDJD); afsOrder != nil {
var afsOrderMap = make(map[*model.AfsOrder]float64) // var afsOrderMap = make(map[*model.AfsOrder]float64)
afsOrderMap[afsOrder] = v.DueAmount // afsOrderMap[afsOrder] = v.DueAmount
afsOrderList = append(afsOrderList, afsOrderMap) // afsOrderList = append(afsOrderList, afsOrderMap)
} else { //} else {
continue // continue
} //}
} store, _ := dao.GetStoreDetail(db, jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, order.VendorOrgCode)
store, _ := dao.GetStoreDetail(db, jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, order.VendorOrgCode) // stores, _ := dao.GetStoreList(db, []int{jxutils.GetSaleStoreIDFromOrder(order)}, nil, nil, nil, nil, "")
// stores, _ := dao.GetStoreList(db, []int{jxutils.GetSaleStoreIDFromOrder(order)}, nil, nil, nil, nil, "") if store != nil {
if store != nil { if order.TotalShopMoney == 0 {
if order.TotalShopMoney == 0 { order.TotalShopMoney = utils.Float64TwoInt64(v.DueAmount * 100)
order.TotalShopMoney = utils.Float64TwoInt64(v.DueAmount * 100) }
} if order.NewEarningPrice == 0 {
if order.NewEarningPrice == 0 { jxutils.RefreshOrderEarningPrice2(order, store.PayPercentage)
jxutils.RefreshOrderEarningPrice2(order, store.PayPercentage) }
} dao.UpdateEntity(db, order, "TotalShopMoney", "NewEarningPrice")
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 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 return err
} }