bug fix

models/luckdraw/luckdraw.go

@@ -55,19 +55,19 @@ func (m *LuckDrawDao) GetLuckDraw(id string) (*LuckDraw, error) {
 }
 
 // LuckDraw 抽奖
-func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuckdrawPrize, *model.TaPrizeDetail, error) {
+func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuckdrawPrize, *model.TaPrizeDetail, *model.TaLuckdrawRecord, error) {
 	luckdraw, err := m.GetLuckDrawByID(id)
 	if err != nil {
-		return nil, nil, errors.New("获取抽奖信息失败！")
+		return nil, nil, nil, errors.New("获取抽奖信息失败！")
 	}
 	if luckdraw.Status != models.STATUS_NORMAL {
-		return nil, nil, errors.New("当前抽奖活动状态异常！")
+		return nil, nil, nil, errors.New("当前抽奖活动状态异常！")
 	}
 	if time.Now().Before(luckdraw.BeginDate) {
-		return nil, nil, errors.New("活动还未开始！")
+		return nil, nil, nil, errors.New("活动还未开始！")
 	}
 	if time.Now().After(luckdraw.EndDate) {
-		return nil, nil, errors.New("活动已结束！")
+		return nil, nil, nil, errors.New("活动已结束！")
 	}
 	// if user.Phone != "" {
 	// 	sysuser, err := m.GetUserByTel(user.Phone)
@@ -81,28 +81,28 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 	userluckdraws, err := m.GetUserRecordByLuckDraw(user.CustomerId, id)
 	if err != nil {
 		utils.LogError("获取用户抽奖信息失败:", err)
-		return nil, nil, errors.New("获取用户抽奖信息失败！")
+		return nil, nil, nil, errors.New("获取用户抽奖信息失败！")
 	}
 	if len(userluckdraws) > 0 {
-		return nil, nil, errors.New("您已参与过此次抽奖，不允许重复抽奖！")
+		return nil, nil, nil, errors.New("您已参与过此次抽奖，不允许重复抽奖！")
 	}
 	prizes, err := m.GetPrizeStock(id)
 	if err != nil {
 		utils.LogError("获取奖项失败:", err)
-		return nil, nil, errors.New("获取奖项失败！")
+		return nil, nil, nil, errors.New("获取奖项失败！")
 	}
 	if len(prizes) == 0 {
 		err = m.UpdateLuckDrawEndDate(luckdraw.Id)
 		if err != nil {
 			utils.LogError("操作失败，请刷新后重试:", err)
-			return nil, nil, errors.New("操作失败，请刷新后重试！")
+			return nil, nil, nil, errors.New("操作失败，请刷新后重试！")
 		}
-		return nil, nil, errors.New("活动已结束！")
+		return nil, nil, nil, errors.New("活动已结束！")
 	}
 	prize, err := m.GetWinning(prizes)
 	if err != nil {
 		utils.LogError("获取奖项失败:", err)
-		return nil, nil, errors.New("获取奖项失败！")
+		return nil, nil, nil, errors.New("获取奖项失败！")
 	}
 
 	// details, err := m.GetPrizeDetail(prize.Id)
@@ -125,7 +125,7 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 	_, err = m.SaveRecord(record)
 	if err != nil {
 		utils.LogError("保存中奖纪录失败：", err)
-		return nil, nil, err
+		return nil, nil, nil, err
 	}
 	// var detail = model.TaPrizeDetail{}
 	// if len(details) > 0 {
@@ -150,12 +150,12 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 		err = m.UpdateStock(prize)
 		if err != nil {
 			utils.LogError("更新库存失败：", err)
-			return nil, nil, err
+			return nil, nil, nil, err
 		}
 		stockprizes, err := m.GetPrizeStock(id)
 		if err != nil {
 			utils.LogError("更新库存失败:", err)
-			return nil, nil, errors.New("操作失败，请刷新后重试！")
+			return nil, nil, nil, errors.New("操作失败，请刷新后重试！")
 		}
 		if len(stockprizes) == 0 {
 			// 更新活动截止时间
@@ -163,7 +163,7 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 		}
 	}
 
-	return prize, nil, err
+	return prize, nil, &record, err
 }
 
 // PrizeWriteOff 奖品核销

service/luckdraw/luckdraw.go

@@ -35,11 +35,25 @@ func (s *LuckdrawServ) GetLuckDraw(id string) (*luckdraw.LuckDraw, error) {
 }
 
 func (s *LuckdrawServ) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuckdrawPrize, *model.TaPrizeDetail, error) {
-	prize, prizeDetail, err := s.dao.LuckDraw(id, user)
+	prize, prizeDetail, recored, err := s.dao.LuckDraw(id, user)
 	if err != nil {
 		utils.LogError("抽奖失败：", err)
 		return nil, nil, err
 	}
+
+	custQRCode := model.TaCustomerCourseQrcode{
+		CustomerCourseId: recored.Id,
+		CustomerQrcode:   utils.GenerateQRCode(),
+		CreateDate:       time.Now(),
+		Status:           models.STATUS_NORMAL,
+		QrcodeType:       models.QRCODE_TYPE_PRIZE,
+	}
+
+	if err := s.courseDAO.SaveCustomerCourseQrcode(&custQRCode); err != nil {
+		utils.LogError("插入中奖二维码失败: " + err.Error())
+		return nil, nil, errors.New("写入中奖二维码失败")
+	}
+
 	return prize, prizeDetail, nil
 }
 
@@ -130,19 +144,6 @@ func (s *LuckdrawServ) SaveRecord(record model.TaLuckdrawRecord) (*model.TaLuckd
 		return nil, errors.New("保存抽奖记录失败")
 	}
 
-	custQRCode := model.TaCustomerCourseQrcode{
-		CustomerCourseId: newRecord.Id,
-		CustomerQrcode:   utils.GenerateQRCode(),
-		CreateDate:       time.Now(),
-		Status:           models.STATUS_NORMAL,
-		QrcodeType:       models.QRCODE_TYPE_PRIZE,
-	}
-
-	if err := s.courseDAO.SaveCustomerCourseQrcode(&custQRCode); err != nil {
-		utils.LogError("插入中奖二维码失败: " + err.Error())
-		return nil, errors.New("写入中奖二维码失败")
-	}
-
 	return newRecord, nil
 }
 

service/marketing/marketing.go

@@ -11,6 +11,7 @@ import (
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/service/events"
 	"spaceofcheng/services/utils"
+	"strconv"
 
 	"github.com/astaxie/beego"
 )
@@ -75,7 +76,8 @@ func (s *MarketingServ) SaveMarketing(activity model.SysActivity, activeType, re
 	// 校验券信息
 	if activeType == events.ActGiveCoupon {
 		couponID := res["giftValue"].(string)
-		amount := res["giftNum"].(int)
+		amountStr := res["giftNum"].(string)
+		amount, _ := strconv.Atoi(amountStr)
 
 		if couponID == "" {
 			return nil, nil, errors.New("未指定赠送券内容")