From 8cd3a1f63744f9c519a5d354f63821bad0a0552b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 4 Aug 2020 11:22:58 +0800
Subject: [PATCH] nenew_earning_perice

---
 business/jxcallback/scheduler/defsch/defsch.go |  2 +-
 business/jxutils/jxutils.go                    | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 639e308e9..c121ada50 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -1180,7 +1180,7 @@ func (s *DefScheduler) updateOrderByBill(order *model.GoodsOrder, bill *model.Wa
 		if bill.Status == model.WaybillStatusDelivered {
 			storeDetail, _ := partner.CurOrderManager.LoadStoreDetail(jxutils.GetSaleStoreIDFromOrder(order), order.VendorID)
 			if storeDetail != nil {
-				jxutils.RefreshOrderEarningPrice2(order, storeDetail.PayPercentage)
+				jxutils.RefreshOrderEarningPrice3(order, storeDetail.PayPercentage, bill)
 				updateFields = append(updateFields, "NewEarningPrice")
 			}
 		}
diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go
index afe67673b..30064d05e 100644
--- a/business/jxutils/jxutils.go
+++ b/business/jxutils/jxutils.go
@@ -601,6 +601,19 @@ func RefreshOrderEarningPrice2(order *model.GoodsOrder, payPercentage int) *mode
 	return order
 }
 
+func RefreshOrderEarningPrice3(order *model.GoodsOrder, payPercentage int, bill *model.Waybill) *model.GoodsOrder {
+	if order.EarningType == model.EarningTypePoints {
+		if order.VendorID == model.VendorIDJDShop || order.VendorID == model.VendorIDJX {
+			order.NewEarningPrice = (order.TotalShopMoney - bill.DesiredFee) * int64((100 - payPercentage)) / 100
+		} else {
+			order.NewEarningPrice = (order.TotalShopMoney - bill.DesiredFee) * int64((100 - payPercentage/2)) / 100
+		}
+	} else {
+		order.NewEarningPrice = order.EarningPrice
+	}
+	return order
+}
+
 func RefreshAfsOrderSkuRelated(afsOrder *model.AfsOrder) *model.AfsOrder {
 	afsOrder.SkuUserMoney = 0
 	afsOrder.PmSkuSubsidyMoney = 0