diff --git a/model/game_card.go b/model/game_card.go index 61dc9b3..ebd3771 100644 --- a/model/game_card.go +++ b/model/game_card.go @@ -116,7 +116,7 @@ func GetGameCardList(sortType, page, pageSize int, gameTypeIds []uint64, storeId qs = qs.OrderAscByID() case 2: // 排序类型 2-新品 - qs = qs.NewProductsEq(1) + qs = qs.NewProductsEq(1).OrderDescByID() //count, err = NewGameCardQuerySet(DB).NewProductsEq(1).Count() case 3: // 排序类型 3-销量 @@ -181,7 +181,7 @@ func GetGameCardList(sortType, page, pageSize int, gameTypeIds []uint64, storeId //err := NewGameCardGoodsStockQuerySet(DB).StoreIdEq(uint64(storeId)).RentStockGt(0). // OrderDescByRentStock().All(&cardStocks) //DB.Table("game_card_goods_stock").Joins("") - cardStockSql1 := fmt.Sprintf("SELECT a.* FROM game_card_goods_stock a LEFT JOIN game_card b ON a.game_card_id=b.id WHERE a.store_id=%d AND a.rent_stock>0 ORDER BY b.id DESC;", storeId) + cardStockSql1 := fmt.Sprintf("SELECT a.* FROM game_card_goods_stock a LEFT JOIN game_card b ON a.game_card_id=b.id WHERE a.store_id=%d AND a.rent_stock>0 ORDER BY b.id ASC;", storeId) err = DB.Raw(cardStockSql1).Scan(&cardStocks).Error if err != nil { logger.Error("GetGameIdByType err:", err) @@ -198,7 +198,7 @@ func GetGameCardList(sortType, page, pageSize int, gameTypeIds []uint64, storeId cardStocks = []GameCardGoodsStock{} //err = NewGameCardGoodsStockQuerySet(DB).StoreIdNe(uint64(storeId)).RentStockGt(0). // OrderDescByRentStock().All(&cardStocks) - cardStockSql2 := fmt.Sprintf("SELECT a.* FROM game_card_goods_stock a LEFT JOIN game_card b ON a.game_card_id=b.id WHERE a.store_id!=%d AND a.rent_stock>0 ORDER BY b.id DESC;", storeId) + cardStockSql2 := fmt.Sprintf("SELECT a.* FROM game_card_goods_stock a LEFT JOIN game_card b ON a.game_card_id=b.id WHERE a.store_id!=%d AND a.rent_stock>0 ORDER BY b.id ASC;", storeId) err = DB.Raw(cardStockSql2).Scan(&cardStocks).Error if err != nil { logger.Error("GetGameIdByType err:", err) @@ -214,7 +214,7 @@ func GetGameCardList(sortType, page, pageSize int, gameTypeIds []uint64, storeId cardStocks = []GameCardGoodsStock{} //err = NewGameCardGoodsStockQuerySet(DB).RentStockEq(0).All(&cardStocks) - cardStockSql3 := fmt.Sprintf("SELECT a.* FROM game_card_goods_stock a LEFT JOIN game_card b ON a.game_card_id=b.id WHERE a.rent_stock=0 ORDER BY b.id DESC;") + cardStockSql3 := fmt.Sprintf("SELECT a.* FROM game_card_goods_stock a LEFT JOIN game_card b ON a.game_card_id=b.id WHERE a.rent_stock=0 ORDER BY b.id ASC;") err = DB.Raw(cardStockSql3).Scan(&cardStocks).Error if err != nil { logger.Error("GetGameIdByType err:", err) @@ -235,7 +235,7 @@ func GetGameCardList(sortType, page, pageSize int, gameTypeIds []uint64, storeId var cardStocks []GameCardGoodsStock //err := NewGameCardGoodsStockQuerySet(DB).RentStockGt(0). // OrderDescByRentStock().All(&cardStocks) - cardStockSql1 := fmt.Sprintf("SELECT a.* FROM game_card_goods_stock a LEFT JOIN game_card b ON a.game_card_id=b.id WHERE a.rent_stock>0 ORDER BY b.id DESC;") + cardStockSql1 := fmt.Sprintf("SELECT a.* FROM game_card_goods_stock a LEFT JOIN game_card b ON a.game_card_id=b.id WHERE a.rent_stock>0 ORDER BY b.id ASC;") err = DB.Raw(cardStockSql1).Scan(&cardStocks).Error if err != nil { logger.Error("GetGameIdByType err:", err) @@ -251,7 +251,7 @@ func GetGameCardList(sortType, page, pageSize int, gameTypeIds []uint64, storeId cardStocks = []GameCardGoodsStock{} //err = NewGameCardGoodsStockQuerySet(DB).RentStockEq(0).All(&cardStocks) - cardStockSql2 := fmt.Sprintf("SELECT a.* FROM game_card_goods_stock a LEFT JOIN game_card b ON a.game_card_id=b.id WHERE a.rent_stock=0 ORDER BY b.id DESC;") + cardStockSql2 := fmt.Sprintf("SELECT a.* FROM game_card_goods_stock a LEFT JOIN game_card b ON a.game_card_id=b.id WHERE a.rent_stock=0 ORDER BY b.id ASC;") err = DB.Raw(cardStockSql2).Scan(&cardStocks).Error if err != nil { logger.Error("GetGameIdByType err:", err) diff --git a/model/model_test.go b/model/model_test.go index c579500..8ad778b 100644 --- a/model/model_test.go +++ b/model/model_test.go @@ -127,23 +127,23 @@ func InitTestDB() { //&HomeCarousel{}, //&UserRenewalLog{}, - &User{}, - &UserOpenMemberRecord{}, - &CooperativeMemberDeduct{}, - &CooperativeAssistantMemberDeduct{}, - &UserMemberRecord{}, - &CooperativeDeductSettle{}, - &CooperativeMemberPromotionStore{}, - &CooperativeMemberPromotionDay{}, - &InviteMemberReport{}, - &MemberStatisticDaily{}, - &CooperativeMemberPromotion{}, - &GameCard{}, - &CooperativeMemberPromotionStoreDay{}, - - &UserInvite{}, - &UserInviteRecord{}, - &CooperativeMemberPromotionStore{}, + //&User{}, + //&UserOpenMemberRecord{}, + //&CooperativeMemberDeduct{}, + //&CooperativeAssistantMemberDeduct{}, + //&UserMemberRecord{}, + //&CooperativeDeductSettle{}, + //&CooperativeMemberPromotionStore{}, + //&CooperativeMemberPromotionDay{}, + //&InviteMemberReport{}, + //&MemberStatisticDaily{}, + //&CooperativeMemberPromotion{}, + //&GameCard{}, + //&CooperativeMemberPromotionStoreDay{}, + // + //&UserInvite{}, + //&UserInviteRecord{}, + //&CooperativeMemberPromotionStore{}, &RecycleCardOrder{}, ) @@ -254,23 +254,23 @@ func InitDBProd() { //&CooperativeMemberPromotionDay{}, //&CooperativeMemberPromotionStoreDay{}, - &User{}, - &UserOpenMemberRecord{}, - &CooperativeMemberDeduct{}, - &CooperativeAssistantMemberDeduct{}, - &UserMemberRecord{}, - &CooperativeDeductSettle{}, - &CooperativeMemberPromotionStore{}, - &CooperativeMemberPromotionDay{}, - &InviteMemberReport{}, - &MemberStatisticDaily{}, - &CooperativeMemberPromotion{}, - &GameCard{}, - &CooperativeMemberPromotionStoreDay{}, - - &UserInvite{}, - &UserInviteRecord{}, - &CooperativeMemberPromotionStore{}, + //&User{}, + //&UserOpenMemberRecord{}, + //&CooperativeMemberDeduct{}, + //&CooperativeAssistantMemberDeduct{}, + //&UserMemberRecord{}, + //&CooperativeDeductSettle{}, + //&CooperativeMemberPromotionStore{}, + //&CooperativeMemberPromotionDay{}, + //&InviteMemberReport{}, + //&MemberStatisticDaily{}, + //&CooperativeMemberPromotion{}, + //&GameCard{}, + //&CooperativeMemberPromotionStoreDay{}, + // + //&UserInvite{}, + //&UserInviteRecord{}, + //&CooperativeMemberPromotionStore{}, &RecycleCardOrder{}, ) diff --git a/model/recycle_card.go b/model/recycle_card.go index a208a1a..1c12b81 100644 --- a/model/recycle_card.go +++ b/model/recycle_card.go @@ -35,7 +35,9 @@ type RecycleCardOrder struct { Describe string `json:"describe"` // 描述 Remark string `json:"remark"` // 备注 AssistantName string `json:"assistant_name"` // 店员 + RetrieveTime time.Time `json:"retrieve_time"` // 审核时间 RetrieveState uint32 `json:"retrieve_state"` // 回收卡状态 1-未确认 2-已确认 + OriginalPrice uint32 `json:"original_price"` // 原价 // recycle_card_order } @@ -81,6 +83,7 @@ func RecycleCardOrderCreate(uid uint32, req xianmai.GameEvaluationReq) (*Recycle return order, err } //evaluation = (evaluation * 1) / 100 + order.OriginalPrice = uint32(evaluation) info, err := RecycleCardConfigInfo() if err != nil { logger.Error("config err:", err)