三方配送新规则

2020-11-16 09:31:13 +08:00
parent 2ef49a83d0
commit d2e6cdc9c3
1 changed files with 4 additions and 2 deletions
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -799,9 +799,11 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
 				}

 				var income int64
-				if order.EarningType == model.EarningTypePoints {
+				if order.OrderPayPercentage < 50 {
 					income = order.TotalShopMoney * int64((order.OrderPayPercentage / 2))
-				} else {
+				} else if order.OrderPayPercentage > 50 && order.OrderPayPercentage < 100 {
+					income = order.TotalShopMoney - order.NewEarningPrice
+				} else if order.OrderPayPercentage == 100 {
 					income = order.TotalShopMoney - order.ShopPrice
 				}
 				//2020-11-16 预计收益-配送费 > 0 再发