From d2e6cdc9c388b32e578adb09880a0aefd6e72503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 16 Nov 2020 09:31:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=96=B9=E9=85=8D=E9=80=81=E6=96=B0?=
 =?UTF-8?q?=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/scheduler/defsch/defsch.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index a086164d5..61caaf525 100644
--- 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 再发