From 05140d0baf7eac38f75575db8d9130cef5175df6 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, 29 Dec 2020 16:45:20 +0800
Subject: [PATCH] aa

---
 business/jxcallback/scheduler/defsch/defsch.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 997fb8839..eda0c1103 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -1572,8 +1572,13 @@ func OrderProfitWarning(order *model.GoodsOrder) {
 	}
 	storeID := jxutils.GetShowStoreIDFromOrder(order)
 	storeDetail, err := dao.GetStoreDetail(db, storeID, order.VendorID, "")
+	payPercentage := 0
 	if storeDetail != nil && err == nil {
-		payPercentage := storeDetail.PayPercentage
+		if storeDetail.VendorPayPercentage != 0 {
+			payPercentage = storeDetail.VendorPayPercentage
+		} else {
+			payPercentage = storeDetail.PayPercentage
+		}
 		if beego.BConfig.RunMode == "jxgy" {
 			if payPercentage >= 50 {
 				profit = utils.Str2Float64(utils.Int64ToStr(order.TotalShopMoney-order.EarningPrice)) / 100