抽奖修改

models/luckdraw/luckdraw.go

@@ -130,12 +130,17 @@ func (m *LuckDrawDao) GetLuckDrawShare(id, tel string, page, pageSize int) ([]mo
 	return shares, err
 }
 
+// PrizeWithDefaults 奖品关联内定
+type PrizeWithDefaults struct {
+	model.TaLuckdrawPrize `xorm:"extends"`
+	Defaults              []model.TaPrizeDefault
+}
+
 // LuckDrawInfo 抽奖info
 type LuckDrawInfo struct {
 	model.TaLuckdraw `xorm:"extends"`
-	Prizes           []model.TaLuckdrawPrize
+	Prizes           []PrizeWithDefaults
 	Imgs             []model.TaLuckdrawImg
-	Defaults         []model.TaPrizeDefault
 }
 
 // GetLuckDrawInfoByID 获取抽奖信息
@@ -152,7 +157,7 @@ func (m *LuckDrawDao) GetLuckDrawInfoByID(id string) (*LuckDrawInfo, error) {
 	if luckdraw.Id == "" {
 		return nil, nil
 	}
-	prizes, err := m.GetPrizes(id)
+	prizes, err := m.GetPrizesWithDefaults(id)
 	if err != nil {
 		utils.LogError("获取奖品信息失败：", err)
 		return nil, errors.New("获取奖品信息失败")
@@ -164,12 +169,12 @@ func (m *LuckDrawDao) GetLuckDrawInfoByID(id string) (*LuckDrawInfo, error) {
 		return nil, errors.New("获取抽奖图片信息失败")
 	}
 	luckdraw.Imgs = imgs
-	defaults, err := m.GetLuckDrawDefault(id)
-	if err != nil {
-		utils.LogError("获取奖品内置信息失败：", err)
-		return nil, errors.New("获取奖品信息失败")
-	}
-	luckdraw.Defaults = defaults
+	// defaults, err := m.GetLuckDrawDefault(id)
+	// if err != nil {
+	// 	utils.LogError("获取奖品内置信息失败：", err)
+	// 	return nil, errors.New("获取奖品信息失败")
+	// }
+	// luckdraw.Defaults = defaults
 	return &luckdraw, err
 }
 
@@ -253,18 +258,30 @@ func (m *LuckDrawDao) SaveLuckDrawDefault(defaults []model.TaPrizeDefault, luckd
 }
 
 // SaveLuckDrawPrizes 保存奖品信息
-func (m *LuckDrawDao) SaveLuckDrawPrizes(prizes []model.TaLuckdrawPrize, luckdrawid string) error {
+func (m *LuckDrawDao) SaveLuckDrawPrizes(prizes []PrizeWithDefaults, luckdraw *model.TaLuckdraw) error {
+	var saveprizes []model.TaLuckdrawPrize
 	for inx, prize := range prizes {
 		if prize.Id == "" {
-			prizes[inx].LuckdrawId = luckdrawid
+			prizes[inx].LuckdrawId = luckdraw.Id
 			prizes[inx].Id = utils.GetGUID()
 			prizes[inx].Status = models.STATUS_NORMAL
 		}
 		if prize.PrizeType == models.PRIZE_TYPE_COUPONCARD {
-			m.SavePrizeDetail(prize)
+			m.SavePrizeDetail(prize.TaLuckdrawPrize)
+		}
+		saveprizes = append(saveprizes, prize.TaLuckdrawPrize)
+		// 保存内定信息
+		if luckdraw.IsInternalDefault == models.BOOL_TRUE {
+			err := m.SaveLuckDrawDefault(prize.Defaults, prizes[inx].Id)
+			if err != nil {
+				return err
+			}
 		}
 	}
-	_, err := m.db.Insert(prizes)
+	_, err := m.db.Insert(saveprizes)
+	if err != nil {
+		return err
+	}
 	return err
 }
 
@@ -671,6 +688,31 @@ func (m *LuckDrawDao) GetPrizes(luckdrawid string) ([]model.TaLuckdrawPrize, err
 	return prizes, err
 }
 
+// GetPrizesWithDefaults 获取奖品
+func (m *LuckDrawDao) GetPrizesWithDefaults(luckdrawid string) ([]PrizeWithDefaults, error) {
+	var prizes []PrizeWithDefaults
+	sql := `select * from ta_luckdraw_prize where luckdraw_id=? and status=?`
+	err := m.db.Sql(sql, luckdrawid, models.STATUS_NORMAL).Find(&prizes)
+	if err != nil {
+		return nil, err
+	}
+	for inx, prize := range prizes {
+		defaults, err := m.GetDefaultsByPrize(prize.Id)
+		if err != nil {
+			return nil, err
+		}
+		prizes[inx].Defaults = defaults
+	}
+	return prizes, err
+}
+
+// GetDefaultsByPrize 根据奖品获取内定信息
+func (m *LuckDrawDao) GetDefaultsByPrize(prizeid string) ([]model.TaPrizeDefault, error) {
+	var defaults []model.TaPrizeDefault
+	err := m.db.Where("prize_id=?", prizeid).Find(&defaults)
+	return defaults, err
+}
+
 // UpdateStock 修改库存
 func (m *LuckDrawDao) UpdateStock(prize *model.TaLuckdrawPrize) error {
 	cols := []string{

service/luckdraw/luckdraw.go

@@ -217,16 +217,9 @@ func (s *LuckdrawServ) SaveLuckDraw(luckdraw *luckdraw.LuckDrawInfo) (*model.TaL
 		utils.LogError("保存抽奖图片信息失败: " + err.Error())
 		return nil, errors.New("保存抽奖图片信息失败")
 	}
-	// 保存内定信息
-	if luckdraw.IsInternalDefault == models.BOOL_TRUE {
-		err = s.dao.SaveLuckDrawDefault(luckdraw.Defaults, newInfo.Id)
-		if err != nil {
-			utils.LogError("保存奖品内定信息失败: " + err.Error())
-			return nil, errors.New("保存奖品内定信息失败")
-		}
-	}
+
 	// 保存奖品信息
-	err = s.dao.SaveLuckDrawPrizes(luckdraw.Prizes, newInfo.Id)
+	err = s.dao.SaveLuckDrawPrizes(luckdraw.Prizes, newInfo)
 	if err != nil {
 		utils.LogError("保存奖品信息失败: " + err.Error())
 		return nil, errors.New("保存奖品信息失败")