diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index fa57e4ba3..72fdede0b 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -607,6 +607,14 @@ func (c *OrderManager) loadOrderSku(db *dao.DaoDB, vendorOrderID string, vendorI return orderSkus } +func (c *OrderManager) LoadStoreDetail(storeID, vendorID int) (storeDetail *dao.StoreDetail, err error) { + var ( + db = dao.GetDB() + ) + storeDetail, err = dao.GetStoreDetail(db, storeID, vendorID) + return storeDetail, err +} + func (c *OrderManager) loadOrder(vendorOrderID, vendorOrderID2 string, vendorID int) (order *model.GoodsOrder, err error) { db1 := dao.GetDB() db := db1.Db diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index fca8bea4b..312212392 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -1178,9 +1178,9 @@ func (s *DefScheduler) updateOrderByBill(order *model.GoodsOrder, bill *model.Wa order.WaybillVendorID = bill.WaybillVendorID order.VendorWaybillID = bill.VendorWaybillID if bill.Status == model.WaybillStatusDelivered { - stores, _ := dao.GetStoreList(dao.GetDB(), []int{jxutils.GetSaleStoreIDFromOrder(order)}, nil, nil, nil, "") - if len(stores) > 0 { - jxutils.RefreshOrderEarningPrice2(order, stores[0].PayPercentage) + storeDetail, _ := partner.CurOrderManager.LoadStoreDetail(jxutils.GetSaleStoreIDFromOrder(order), order.VendorID) + if storeDetail != nil { + jxutils.RefreshOrderEarningPrice2(order, storeDetail.PayPercentage) } } } diff --git a/business/partner/partner.go b/business/partner/partner.go index 8be8aa7a4..bd4e9d041 100644 --- a/business/partner/partner.go +++ b/business/partner/partner.go @@ -105,6 +105,7 @@ type IOrderManager interface { UpdateOrderStatusAndDeliveryFlag(order *model.GoodsOrder) (err error) UpdateOrderFields(order *model.GoodsOrder, fieldList []string) (err error) + LoadStoreDetail(storeID, vendorID int) (storeDetail *dao.StoreDetail, err error) LoadWaybill(vendorWaybillID string, waybillVendorID int) (bill *model.Waybill, err error) OnOrderComments(orderCommentList []*model.OrderComment) (err error) diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index e74e245af..68260a8d3 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -159,10 +159,10 @@ func updateOrderBySettleMent(order *model.GoodsOrder, orderSettlement *jdapi.Ord order.TotalShopMoney = orderSettlement.SettlementAmount order.PmSubsidyMoney = orderSettlement.PlatOrderGoodsDiscountMoney + orderSettlement.PlatSkuGoodsDiscountMoney if order.TotalShopMoney > 0 { - order2, _ := dao.GetSimpleOrder(dao.GetDB(), order.VendorOrderID) - stores, _ := dao.GetStoreList(dao.GetDB(), []int{jxutils.GetSaleStoreIDFromOrder(order2)}, nil, nil, nil, "") - if len(stores) > 0 { - jxutils.RefreshOrderEarningPrice2(order, stores[0].PayPercentage) + order2, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.VendorID) + storeDetail, _ := partner.CurOrderManager.LoadStoreDetail(jxutils.GetSaleStoreIDFromOrder(order2), order.VendorID) + if storeDetail != nil { + jxutils.RefreshOrderEarningPrice2(order, storeDetail.PayPercentage) } else { globals.SugarLogger.Warnf("updateOrderBySettleMent,%v,%v,%v", order.VendorOrderID, orderSettlement.SettlementAmount) }