From d8167c5facd5f431bc908cf45ddd406664ec44df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 28 May 2020 09:31:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=98=AF=E7=AC=AC=E4=B8=80=E6=AC=A1=E4=B8=8B=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/orderman_ext.go | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index f4441fa92..89e713132 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -1371,13 +1371,17 @@ func RefreshJdShopOrdersEarningPrice(ctx *jxcontext.Context, orderStartTime, ord
 func GetOrderUserBuyFirst(ctx *jxcontext.Context, vendorOrderID string) (orderPay *model.OrderPay, err error) {
 	sql := `
 		SELECT b.* 
-		  FROM goods_order a, order_pay b 
-		 WHERE a.vendor_order_id = b.vendor_order_id 
-		   AND a.vendor_id = b.vendor_id
-		   AND b.pay_finished_at <> NULL
-		   AND a.vendor_order_id = ?
+		FROM goods_order a, order_pay b
+		WHERE a.vendor_order_id = b.vendor_order_id 
+		AND a.vendor_id = b.vendor_id
+		AND b.pay_finished_at <> 0
+		AND a.vendor_id = ?
+		AND a.user_id = (
+		SELECT user_id 
+		FROM goods_order WHERE vendor_order_id = ?)
+		AND a.vendor_order_id <> ?
 	`
-	sqlParams := []interface{}{vendorOrderID}
+	sqlParams := []interface{}{model.VendorIDJX, vendorOrderID, vendorOrderID}
 	err = dao.GetRow(dao.GetDB(), &orderPay, sql, sqlParams)
 	return orderPay, err
 }