1024AM

controllers/luckdraw/luckdraw.go

@@ -148,7 +148,7 @@ func (c *LuckDrawController) GetUserByCode() {
 
 	user := userRaw.(model.TaCustomer)
 	luckdrawid := c.GetString(":id")
-	record, err := c.serv.GetUserLuckDrawByLuckDraw(user, luckdrawid)
+	record, set, err := c.serv.GetUserLuckDrawByLuckDraw(user, luckdrawid)
 	if err != nil {
 		utils.LogError("获取用户抽奖信息失败: " + err.Error())
 		c.ResponseError(errors.New("获取用户抽奖信息失败"))
@@ -166,6 +166,7 @@ func (c *LuckDrawController) GetUserByCode() {
 		"user":   user,
 		"record": record,
 		"detail": detail,
+		"set":    set,
 	})
 }
 

service/luckdraw/luckdraw.go

@@ -467,19 +467,19 @@ func (s *LuckdrawServ) GetUserRecordByLuckDraw(userid string, luckdrawid string)
 }
 
 // GetUserLuckDrawByLuckDraw 获取用户抽奖信息
-func (s *LuckdrawServ) GetUserLuckDrawByLuckDraw(user model.TaCustomer, luckdrawid string) (*model.TaLuckdrawRecord, error) {
+func (s *LuckdrawServ) GetUserLuckDrawByLuckDraw(user model.TaCustomer, luckdrawid string) (*model.TaLuckdrawRecord, *model.TaLuckdrawCustomer, error) {
 	// 获取用户抽奖设置信息
-	_, err := s.dao.GetUserLuckDrawSet(user, luckdrawid)
+	customerSet, err := s.dao.GetUserLuckDrawSet(user, luckdrawid)
 	if err != nil {
 		utils.LogError("获取用户抽奖设置失败: " + err.Error())
-		return nil, errors.New("获取用户抽奖设置失败")
+		return nil, nil, errors.New("获取用户抽奖设置失败")
 	}
 	record, err := s.dao.GetUserLuckDrawByLuckDraw(user.CustomerId, luckdrawid)
 	if err != nil {
 		utils.LogError("获取用户的抽奖信息失败: " + err.Error())
-		return nil, errors.New("获取用户的抽奖信息失败")
+		return nil, nil, errors.New("获取用户的抽奖信息失败")
 	}
-	return record, nil
+	return record, customerSet, nil
 }
 
 func (s *LuckdrawServ) GetDetailByRecord(recordid string) (*model.TaPrizeDetail, error) {