From 2265cb5afb6f28e90fd912b2ab0009b382b8f92d Mon Sep 17 00:00:00 2001 From: chenlin Date: Fri, 5 Jul 2024 17:04:41 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=8D=A1=E5=B8=A6=E7=8A=B6?= =?UTF-8?q?=E6=80=81=EF=BC=88=E6=8A=A2=E5=85=89=E4=BA=86=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=9C=A8=E6=9C=AC=E5=BA=97=EF=BC=89=E4=B8=8D=E5=87=86=E7=A1=AE?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/game_card.go | 49 +++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/model/game_card.go b/model/game_card.go index ce090b4..72126f0 100644 --- a/model/game_card.go +++ b/model/game_card.go @@ -1807,32 +1807,35 @@ func GameCardListSetStockState(list []GameCard, storeId uint32, storeList []uint } } - err = NewGameCardGoodsStockQuerySet(DB).StoreIdEq(uint64(storeId)).StoreIdIn(uint32ToUint64(storeList)...). - GameCardIdIn(gameCardIds...).RentStockGt(0).All(&cardStocks) - if err != nil { - logger.Error("GetGameIdByType err:", err) - } - for i, _ := range cardStocks { - _, ok := gameIdMap[uint32(cardStocks[i].GameCardId)] - if !ok { - //gameIds = append(gameIds, uint32(cardStocks[i].GameCardId)) - gameIdMap[uint32(cardStocks[i].GameCardId)] = 1 - } - } - err = NewGameCardGoodsStockQuerySet(DB).StoreIdNe(uint64(storeId)).StoreIdIn(uint32ToUint64(storeList)...). GameCardIdIn(gameCardIds...).RentStockGt(0).All(&cardStocks) if err != nil { logger.Error("GetGameIdByType err:", err) } for i, _ := range cardStocks { - _, ok := gameIdMap[uint32(cardStocks[i].GameCardId)] - if !ok { - //gameIds = append(gameIds, uint32(cardStocks[i].GameCardId)) - gameIdMap[uint32(cardStocks[i].GameCardId)] = 2 - } + //_, ok := gameIdMap[uint32(cardStocks[i].GameCardId)] + //if !ok { + // //gameIds = append(gameIds, uint32(cardStocks[i].GameCardId)) + // gameIdMap[uint32(cardStocks[i].GameCardId)] = 2 + //} + + gameIdMap[uint32(cardStocks[i].GameCardId)] = 2 } + err = NewGameCardGoodsStockQuerySet(DB).StoreIdEq(uint64(storeId)).StoreIdIn(uint32ToUint64(storeList)...). + GameCardIdIn(gameCardIds...).RentStockGt(0).All(&cardStocks) + if err != nil { + logger.Error("GetGameIdByType err:", err) + } + for i, _ := range cardStocks { + //_, ok := gameIdMap[uint32(cardStocks[i].GameCardId)] + //if !ok { + // //gameIds = append(gameIds, uint32(cardStocks[i].GameCardId)) + // gameIdMap[uint32(cardStocks[i].GameCardId)] = 1 + //} + + gameIdMap[uint32(cardStocks[i].GameCardId)] = 1 + } } else { var cardStocks []GameCardGoodsStock err := NewGameCardGoodsStockQuerySet(DB).GameCardIdIn(gameCardIds...).StoreIdIn(uint32ToUint64(storeList)...). @@ -1853,10 +1856,12 @@ func GameCardListSetStockState(list []GameCard, storeId uint32, storeList []uint logger.Error("GetGameIdByType err:", err) } for i, _ := range cardStocks { - _, ok := gameIdMap[uint32(cardStocks[i].GameCardId)] - if !ok { - gameIdMap[uint32(cardStocks[i].GameCardId)] = 1 - } + //_, ok := gameIdMap[uint32(cardStocks[i].GameCardId)] + //if !ok { + // gameIdMap[uint32(cardStocks[i].GameCardId)] = 1 + //} + + gameIdMap[uint32(cardStocks[i].GameCardId)] = 1 } }