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

loadstoredetail

Browse Source
This commit is contained in:
苏尹岚
2020-07-27 14:45:01 +08:00
parent b3b5077b94
commit 7f852f1c49
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/jxcallback/orderman/order.go
View File

@@ -607,6 +607,14 @@ func (c *OrderManager) loadOrderSku(db *dao.DaoDB, vendorOrderID string, vendorI
return orderSkus 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) { func (c *OrderManager) loadOrder(vendorOrderID, vendorOrderID2 string, vendorID int) (order *model.GoodsOrder, err error) {
db1 := dao.GetDB() db1 := dao.GetDB()
db := db1.Db db := db1.Db

6
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -1178,9 +1178,9 @@ func (s *DefScheduler) updateOrderByBill(order *model.GoodsOrder, bill *model.Wa
order.WaybillVendorID = bill.WaybillVendorID order.WaybillVendorID = bill.WaybillVendorID
order.VendorWaybillID = bill.VendorWaybillID order.VendorWaybillID = bill.VendorWaybillID
if bill.Status == model.WaybillStatusDelivered { if bill.Status == model.WaybillStatusDelivered {
stores, _ := dao.GetStoreList(dao.GetDB(), []int{jxutils.GetSaleStoreIDFromOrder(order)}, nil, nil, nil, "") storeDetail, _ := partner.CurOrderManager.LoadStoreDetail(jxutils.GetSaleStoreIDFromOrder(order), order.VendorID)
if len(stores) > 0 { if storeDetail != nil {
jxutils.RefreshOrderEarningPrice2(order, stores[0].PayPercentage) jxutils.RefreshOrderEarningPrice2(order, storeDetail.PayPercentage)
} }
} }
} }

1
business/partner/partner.go
View File

@@ -105,6 +105,7 @@ type IOrderManager interface {
UpdateOrderStatusAndDeliveryFlag(order *model.GoodsOrder) (err error) UpdateOrderStatusAndDeliveryFlag(order *model.GoodsOrder) (err error)
UpdateOrderFields(order *model.GoodsOrder, fieldList []string) (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) LoadWaybill(vendorWaybillID string, waybillVendorID int) (bill *model.Waybill, err error)
OnOrderComments(orderCommentList []*model.OrderComment) (err error) OnOrderComments(orderCommentList []*model.OrderComment) (err error)

8
business/partner/purchase/jd/order.go
View File

@@ -159,10 +159,10 @@ func updateOrderBySettleMent(order *model.GoodsOrder, orderSettlement *jdapi.Ord
order.TotalShopMoney = orderSettlement.SettlementAmount order.TotalShopMoney = orderSettlement.SettlementAmount
order.PmSubsidyMoney = orderSettlement.PlatOrderGoodsDiscountMoney + orderSettlement.PlatSkuGoodsDiscountMoney order.PmSubsidyMoney = orderSettlement.PlatOrderGoodsDiscountMoney + orderSettlement.PlatSkuGoodsDiscountMoney
if order.TotalShopMoney > 0 { if order.TotalShopMoney > 0 {
order2, _ := dao.GetSimpleOrder(dao.GetDB(), order.VendorOrderID) order2, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.VendorID)
stores, _ := dao.GetStoreList(dao.GetDB(), []int{jxutils.GetSaleStoreIDFromOrder(order2)}, nil, nil, nil, "") storeDetail, _ := partner.CurOrderManager.LoadStoreDetail(jxutils.GetSaleStoreIDFromOrder(order2), order.VendorID)
if len(stores) > 0 { if storeDetail != nil {
jxutils.RefreshOrderEarningPrice2(order, stores[0].PayPercentage) jxutils.RefreshOrderEarningPrice2(order, storeDetail.PayPercentage)
} else { } else {
globals.SugarLogger.Warnf("updateOrderBySettleMent,%v,%v,%v", order.VendorOrderID, orderSettlement.SettlementAmount) globals.SugarLogger.Warnf("updateOrderBySettleMent,%v,%v,%v", order.VendorOrderID, orderSettlement.SettlementAmount)
} }