From e5772d515a73032d567f17903d7cea263c433558 Mon Sep 17 00:00:00 2001
From: chenlin <chenlin@deovo.net>
Date: Fri, 14 Feb 2025 16:22:34 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=A7=9F=E8=B5=81=E5=8D=A1=E5=B8=A6?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96=EF=BC=8C=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E4=B8=8D=E4=BC=A0=E9=97=A8=E5=BA=97id=E5=88=99=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=A9=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 model/autogenerated_order.go |  4 ++++
 model/game_card.go           | 22 ++++++++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/model/autogenerated_order.go b/model/autogenerated_order.go
index 9b2f9f4..e27a68a 100644
--- a/model/autogenerated_order.go
+++ b/model/autogenerated_order.go
@@ -2027,6 +2027,10 @@ func (qs OrderCardQuerySet) StoreIdEq(storeId uint32) OrderCardQuerySet {
 	return qs.w(qs.db.Where("store_id = ?", storeId))
 }
 
+func (qs OrderCardQuerySet) StoreIdOrRevertStoreIdEq(storeId uint64) OrderCardQuerySet {
+	return qs.w(qs.db.Where("store_id = ? or revert_store_id = ?", storeId, storeId))
+}
+
 // StoreIdGt is an autogenerated method
 // nolint: dupl
 func (qs OrderCardQuerySet) StoreIdGt(storeId uint32) OrderCardQuerySet {
diff --git a/model/game_card.go b/model/game_card.go
index 58532e8..5ba6ff9 100644
--- a/model/game_card.go
+++ b/model/game_card.go
@@ -919,10 +919,15 @@ func (m *CooperativeRentCardOrderListReq) List() ([]Order, int, error) {
 	if m.PageSize == 0 {
 		m.PageSize = 10
 	}
-	assistant := GetUserByUid(m.AssistantUid)
-	if m.SerialNumber == "" {
-		m.StoreId = assistant.StoreId
+
+	if m.StoreId == 0 {
+		return []Order{}, 0, nil
 	}
+
+	assistant := GetUserByUid(m.AssistantUid)
+	//if m.SerialNumber == "" && m.StoreId == 0{
+	//	m.StoreId = assistant.StoreId
+	//}
 	if assistant.UserType != 2 {
 		return orders, 0, errors.New("not assistant")
 	}
@@ -978,7 +983,16 @@ func (m *CooperativeRentCardOrderListReq) List() ([]Order, int, error) {
 		qs = qs.CreatedAtLte(m.EndTime)
 	}
 	if m.StoreId != 0 {
-		qs = qs.StoreIdEq(m.StoreId)
+		err := NewOrderCardQuerySet(DB).StoreIdOrRevertStoreIdEq(m.StoreId).OrderDescByID().OrderAscByCardStatus().All(&orderCards)
+		if err != nil {
+			logger.Error("err:", err)
+			return orders, 0, err
+		}
+		orderIds := make([]uint32, 0)
+		for i, _ := range orderCards {
+			orderIds = append(orderIds, orderCards[i].OrderId)
+		}
+		qs = qs.IDIn(orderIds...)
 	}
 	count, err := qs.Count()
 	if err != nil {