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-07-27 14:21:08 +08:00
parent 8b82892376
commit b3b5077b94
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1177,6 +1177,12 @@ func (s *DefScheduler) updateOrderByBill(order *model.GoodsOrder, bill *model.Wa
} else { } else {
order.WaybillVendorID = bill.WaybillVendorID order.WaybillVendorID = bill.WaybillVendorID
order.VendorWaybillID = bill.VendorWaybillID 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)
}
}
} }
if revertStatus { if revertStatus {
order.Status = model.OrderStatusFinishedPickup order.Status = model.OrderStatusFinishedPickup

4
business/jxutils/jxutils.go
View File

@@ -590,7 +590,11 @@ func RefreshOrderSkuRelated(order *model.GoodsOrder) *model.GoodsOrder {
func RefreshOrderEarningPrice2(order *model.GoodsOrder, payPercentage int) *model.GoodsOrder { func RefreshOrderEarningPrice2(order *model.GoodsOrder, payPercentage int) *model.GoodsOrder {
if payPercentage <= 50 { if payPercentage <= 50 {
if order.VendorID == model.VendorIDJDShop || order.VendorID == model.VendorIDJX {
order.NewEarningPrice = order.TotalShopMoney * int64((100 - payPercentage/2)) / 100 order.NewEarningPrice = order.TotalShopMoney * int64((100 - payPercentage/2)) / 100
} else {
order.NewEarningPrice = order.TotalShopMoney * int64((100 - payPercentage)) / 100
}
} else { } else {
order.NewEarningPrice = order.EarningPrice order.NewEarningPrice = order.EarningPrice
} }

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

@@ -162,18 +162,13 @@ func updateOrderBySettleMent(order *model.GoodsOrder, orderSettlement *jdapi.Ord
order2, _ := dao.GetSimpleOrder(dao.GetDB(), order.VendorOrderID) order2, _ := dao.GetSimpleOrder(dao.GetDB(), order.VendorOrderID)
stores, _ := dao.GetStoreList(dao.GetDB(), []int{jxutils.GetSaleStoreIDFromOrder(order2)}, nil, nil, nil, "") stores, _ := dao.GetStoreList(dao.GetDB(), []int{jxutils.GetSaleStoreIDFromOrder(order2)}, nil, nil, nil, "")
if len(stores) > 0 { if len(stores) > 0 {
if stores[0].PayPercentage <= 50 { jxutils.RefreshOrderEarningPrice2(order, stores[0].PayPercentage)
order.NewEarningPrice = orderSettlement.SettlementAmount * int64((100 - stores[0].PayPercentage/2)) / 100
} else {
order.NewEarningPrice = order.EarningPrice
}
} else { } else {
globals.SugarLogger.Warnf("updateOrderBySettleMent,%v,%v,%v", order.VendorOrderID, orderSettlement.SettlementAmount) globals.SugarLogger.Warnf("updateOrderBySettleMent,%v,%v,%v", order.VendorOrderID, orderSettlement.SettlementAmount)
} }
} else { } else {
order.NewEarningPrice = order.EarningPrice order.NewEarningPrice = order.EarningPrice
} }
globals.SugarLogger.Debugf("updateOrderBySettleMent,%v,%v,%v", order.VendorOrderID, order.NewEarningPrice, jxutils.GetSaleStoreIDFromOrder(order))
} }
} }