1024PM

conf/app.conf

@@ -5,7 +5,7 @@ autorender = false
 copyrequestbody = true
 EnableDocs = true
 excelpath = ./
-clienturl = http://dev.ycjcjy.com/c-v2
+clienturl = http://dev.ycjcjy.com/
 
 postwechatInfo = http://testapi.chioy.com.cn/api/network/postwechatInfo
 qrcodePrefix = bodycheck_

conf/log.conf

@@ -1,4 +1,4 @@
 [common]
-filename="E:\\GoProjects\\src\\spaceofcheng\\services\\log\\common.log"
+filename="E:\\GoProject\\src\\spaceofcheng\\services\\log\\common.log"
 # log level "emergency", "alert", "critical", "error", "warning", "notice", "info", "debug"
 level="debug"

models/luckdraw/luckdraw.go

@@ -277,10 +277,13 @@ func (m *LuckDrawDao) SaveLuckDrawPrizes(prizes []PrizeWithDefaults, luckdraw *m
 			prizes[inx].Status = models.STATUS_NORMAL
 		}
 		if prize.PrizeType == models.PRIZE_TYPE_COUPONCARD {
-			err := m.SavePrizeDetail(prizes[inx].TaLuckdrawPrize)
+			valid, err := m.SavePrizeDetail(prizes[inx].TaLuckdrawPrize)
 			if err != nil {
 				return err
 			}
+			prizes[inx].ValidDays = valid.ValidDays
+			prizes[inx].VerificationStart = valid.VerificationStart
+			prizes[inx].VerificationEnd = valid.VerificationEnd
 		}
 		saveprizes = append(saveprizes, prizes[inx].TaLuckdrawPrize)
 		// 保存内定信息
@@ -298,17 +301,28 @@ func (m *LuckDrawDao) SaveLuckDrawPrizes(prizes []PrizeWithDefaults, luckdraw *m
 	return err
 }
 
+// Verification 有效期
+type Verification struct {
+	ValidDays         int
+	VerificationStart time.Time
+	VerificationEnd   time.Time
+}
+
 // SavePrizeDetail 保存奖品明细
-func (m *LuckDrawDao) SavePrizeDetail(prize model.TaLuckdrawPrize) error {
+func (m *LuckDrawDao) SavePrizeDetail(prize model.TaLuckdrawPrize) (*Verification, error) {
+	var verification = Verification{}
 	if prize.CouponCardType == models.PRIZE_TYPE_COUPON {
 		var coupon model.TaCoupon
 		_, err := m.db.Where("coupon_id=?", prize.CouponCardId).Get(&coupon)
 		if err != nil {
-			return err
+			return nil, err
 		}
 		if coupon.UsedCount > 0 {
-			return errors.New("卡券已被使用！不允许保存！")
+			return nil, errors.New("卡券已被使用！不允许保存！")
 		}
+		verification.ValidDays = coupon.ValidDays
+		verification.VerificationStart = coupon.StartDate
+		verification.VerificationEnd = coupon.EndDate
 		var details []model.TaPrizeDetail
 		i := 0
 		for i < coupon.TotalCount {
@@ -329,11 +343,14 @@ func (m *LuckDrawDao) SavePrizeDetail(prize model.TaLuckdrawPrize) error {
 		var card model.TaCouponCard
 		_, err := m.db.Where("card_id=?", prize.CouponCardId).Get(&card)
 		if err != nil {
-			return err
+			return nil, err
 		}
 		if card.UsedCount > 0 {
-			return errors.New("卡券已被使用！不允许保存！")
+			return nil, errors.New("卡券已被使用！不允许保存！")
 		}
+		verification.ValidDays = 0
+		verification.VerificationStart = card.StartDate
+		verification.VerificationEnd = card.EndDate
 		var details []model.TaPrizeDetail
 		i := 0
 		for i < card.TotalCount {
@@ -352,7 +369,7 @@ func (m *LuckDrawDao) SavePrizeDetail(prize model.TaLuckdrawPrize) error {
 		m.db.Insert(details)
 	}
 
-	return nil
+	return &verification, nil
 }
 
 // UpdateLuckDraw 修改抽奖
@@ -677,7 +694,7 @@ func (m *LuckDrawDao) GetWinning(prizes []model.TaLuckdrawPrize) (*model.TaLuckd
 
 	for _, prize := range prizes {
 		// 有剩余的 并且 未过期的
-		if prize.Remainder > 0 && now.Before(prize.VerificationEnd) {
+		if prize.Remainder > 0 && (now.Before(prize.VerificationEnd) || prize.ValidDays > 0) {
 			p := map[string]interface{}{
 				"prize": prize,
 				"prob":  prize.Probability,
@@ -687,6 +704,7 @@ func (m *LuckDrawDao) GetWinning(prizes []model.TaLuckdrawPrize) (*model.TaLuckd
 		}
 	}
 
+	utils.LogError(pList)
 	if len(pList) == 0 {
 		return nil, errors.New("所有奖品已抽完")
 	}