From 52b3ceae408993970a810b66feefdf1fee8ac625 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 29 Nov 2023 11:27:05 +0800
Subject: [PATCH] 1

---
 business/jxcallback/orderman/orderman_ext.go | 122 +++++++++----------
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index 95b689a04..c685b486a 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -1168,75 +1168,75 @@ func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID,
 		sqlParams []interface{}
 	)
 	// 如果搜索关键字可能为订单或售后单号，则当成订单或售后单查询
-	//if keyword != "" {
-	//	if jxutils.GetPossibleVendorIDFromAfsOrderID(keyword) > model.VendorIDUnknown && afsOrderID == "" {
-	//		afsOrderID = keyword
-	//	}
-	//	if jxutils.GetPossibleVendorIDFromVendorOrderID(keyword) > model.VendorIDUnknown && vendorOrderID == "" {
-	//		vendorOrderID = keyword
-	//	}
-	//}
-	//if vendorOrderID != "" || afsOrderID != "" {
-	//	sqlWhere = "WHERE (0 = 1"
-	//	if vendorOrderID != "" {
-	//		sqlWhere += " OR (t1.vendor_order_id = ? OR t1.vendor_order_id2 = ?)"
-	//		sqlParams = append(sqlParams, []interface{}{
-	//			vendorOrderID,
-	//			vendorOrderID,
-	//		})
-	//	}
-	//	if afsOrderID != "" {
-	//		sqlWhere += " OR (t1.afs_order_id = ?)"
-	//		sqlParams = append(sqlParams, []interface{}{
-	//			afsOrderID,
-	//		})
-	//	}
-	//	sqlWhere += ")"
-	//} else {
-	if toTime.Sub(fromTime) > 24*time.Hour*60 {
-		return nil, fmt.Errorf("售后单查询时间不能超过60天")
+	if keyword != "" {
+		if jxutils.GetPossibleVendorIDFromAfsOrderID(keyword) > model.VendorIDUnknown && afsOrderID == "" {
+			afsOrderID = keyword
+		}
+		if jxutils.GetPossibleVendorIDFromVendorOrderID(keyword) > model.VendorIDUnknown && vendorOrderID == "" {
+			vendorOrderID = keyword
+		}
 	}
-	sqlWhere = `
+	if vendorOrderID != "" || afsOrderID != "" {
+		sqlWhere = "WHERE (0 = 1"
+		if vendorOrderID != "" {
+			sqlWhere += " OR (t1.vendor_order_id = ? OR t1.vendor_order_id2 = ?)"
+			sqlParams = append(sqlParams, []interface{}{
+				vendorOrderID,
+				vendorOrderID,
+			})
+		}
+		if afsOrderID != "" {
+			sqlWhere += " OR (t1.afs_order_id = ?)"
+			sqlParams = append(sqlParams, []interface{}{
+				afsOrderID,
+			})
+		}
+		sqlWhere += ")"
+	} else {
+		if toTime.Sub(fromTime) > 24*time.Hour*60 {
+			return nil, fmt.Errorf("售后单查询时间不能超过60天")
+		}
+		sqlWhere = `
 		WHERE t1.afs_created_at >= ? AND t1.afs_created_at <= ?
 		`
-	sqlParams = []interface{}{
-		fromTime,
-		toTime,
-	}
-	if keyword != "" {
-		keywordLike := "%" + keyword + "%"
-		sqlWhere += `
+		sqlParams = []interface{}{
+			fromTime,
+			toTime,
+		}
+		if keyword != "" {
+			keywordLike := "%" + keyword + "%"
+			sqlWhere += `
 			AND (t1.vendor_order_id2 LIKE ? OR t1.vendor_order_id LIKE ? OR t1.afs_order_id LIKE ?
 			OR t1.vendor_store_id LIKE ? OR t1.reason_desc LIKE ?
 			`
-		sqlParams = append(sqlParams, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike)
-		if keywordInt64 := utils.Str2Int64WithDefault(keyword, 0); keywordInt64 > 0 {
-			sqlWhere += " OR t1.store_id = ? OR t1.jx_store_id = ?"
-			sqlParams = append(sqlParams, keywordInt64, keywordInt64)
+			sqlParams = append(sqlParams, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike)
+			if keywordInt64 := utils.Str2Int64WithDefault(keyword, 0); keywordInt64 > 0 {
+				sqlWhere += " OR t1.store_id = ? OR t1.jx_store_id = ?"
+				sqlParams = append(sqlParams, keywordInt64, keywordInt64)
+			}
+			sqlWhere += ")"
+		}
+		if len(storeIDList) > 0 {
+			sqlWhere += " AND IF(t1.jx_store_id != 0, t1.jx_store_id, t1.store_id) IN (" + dao.GenQuestionMarks(len(storeIDList)) + ")"
+			sqlParams = append(sqlParams, storeIDList)
+		}
+		if len(statusList) > 0 {
+			sqlWhere += " AND t1.status IN (" + dao.GenQuestionMarks(len(statusList)) + ")"
+			sqlParams = append(sqlParams, statusList)
+		}
+		if len(appealTypeList) > 0 {
+			sqlWhere += " AND t1.appeal_type IN (" + dao.GenQuestionMarks(len(appealTypeList)) + ")"
+			sqlParams = append(sqlParams, appealTypeList)
+		}
+		if len(skuIDs) > 0 {
+			sqlWhere += " AND (SELECT COUNT(*) FROM order_sku_financial t11 WHERE t11.is_afs_order = 1 AND t11.afs_order_id = t1.afs_order_id AND t11.vendor_id = t1.vendor_id AND t11.jx_sku_id IN (" + dao.GenQuestionMarks(len(skuIDs)) + ")) > 0"
+			sqlParams = append(sqlParams, skuIDs)
+		}
+		if len(vendorIDList) > 0 {
+			sqlWhere += " AND t1.vendor_id IN (" + dao.GenQuestionMarks(len(vendorIDList)) + ")"
+			sqlParams = append(sqlParams, vendorIDList)
 		}
-		sqlWhere += ")"
 	}
-	if len(storeIDList) > 0 {
-		sqlWhere += " AND IF(t1.jx_store_id != 0, t1.jx_store_id, t1.store_id) IN (" + dao.GenQuestionMarks(len(storeIDList)) + ")"
-		sqlParams = append(sqlParams, storeIDList)
-	}
-	if len(statusList) > 0 {
-		sqlWhere += " AND t1.status IN (" + dao.GenQuestionMarks(len(statusList)) + ")"
-		sqlParams = append(sqlParams, statusList)
-	}
-	if len(appealTypeList) > 0 {
-		sqlWhere += " AND t1.appeal_type IN (" + dao.GenQuestionMarks(len(appealTypeList)) + ")"
-		sqlParams = append(sqlParams, appealTypeList)
-	}
-	if len(skuIDs) > 0 {
-		sqlWhere += " AND (SELECT COUNT(*) FROM order_sku_financial t11 WHERE t11.is_afs_order = 1 AND t11.afs_order_id = t1.afs_order_id AND t11.vendor_id = t1.vendor_id AND t11.jx_sku_id IN (" + dao.GenQuestionMarks(len(skuIDs)) + ")) > 0"
-		sqlParams = append(sqlParams, skuIDs)
-	}
-	if len(vendorIDList) > 0 {
-		sqlWhere += " AND t1.vendor_id IN (" + dao.GenQuestionMarks(len(vendorIDList)) + ")"
-		sqlParams = append(sqlParams, vendorIDList)
-	}
-	//}
 	sql += sqlWhere
 	sql += `
 	ORDER BY t1.afs_created_at DESC