Merge branch '2.1.0' of http://git.ycjcjy.com/SpaceOfCheng/services into 2.1.0

models/luckdraw/luckdraw.go

@@ -333,7 +333,7 @@ func (m *LuckDrawDao) SavePrizeDetail(prize model.TaLuckdrawPrize) (*Verificatio
 				Id:      utils.GetGUID(),
 				PrizeId: prize.Id,
 				Url:     url,
-				Status:  models.STATUS_NORMAL,
+				Status:  models.STATUS_READY,
 			}
 			details = append(details, d)
 			i = i + 1
@@ -360,8 +360,8 @@ func (m *LuckDrawDao) SavePrizeDetail(prize model.TaLuckdrawPrize) (*Verificatio
 			var d = model.TaPrizeDetail{
 				Id:      utils.GetGUID(),
 				PrizeId: prize.Id,
-				Url:     beego.AppConfig.String("clientShareURL") + url,
-				Status:  models.STATUS_NORMAL,
+				Url:     url,
+				Status:  models.STATUS_READY,
 			}
 			details = append(details, d)
 			i = i + 1
@@ -474,11 +474,13 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 		// 抽奖次数库存修改
 		err := m.UpdateCstLuckdrawSurplus(cstluckdrawSet)
 		if err != nil {
+			utils.LogError("更新抽奖次数库存失败：", err)
 			return nil, nil, nil, errors.New("操作失败，请刷新后重试！")
 		}
 		// 更新参与人数
 		err = m.UpdateLuckDrawJoinedNum(id)
 		if err != nil {
+			utils.LogError("更新参与人数失败：", err)
 			return nil, nil, nil, errors.New("操作失败，请刷新后重试！")
 		}
 	}
@@ -871,7 +873,7 @@ func (m *LuckDrawDao) UpdateRecord(record *LuckInfo) error {
 		"status",
 		"writeoff_date",
 	}
-	_, err := m.db.Cols(cols...).Where("id=?", record.Id).Update(record)
+	_, err := m.db.Cols(cols...).Where("id=?", record.Id).Update(record.TaLuckdrawRecord)
 	return err
 }
 

models/models.go

@@ -22,7 +22,7 @@ func NewDBEngine() *xorm.Engine {
 	dns := getMySQLDNS()
 
 	engine, err := xorm.NewEngine(dbType, dns)
-	// engine.ShowSQL()
+	engine.ShowSQL()
 
 	if err != nil {
 		panic(err)

service/luckdraw/luckdraw.go

@@ -2,7 +2,6 @@ package luckdraw
 
 import (
 	"errors"
-	"fmt"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/course"
 	"spaceofcheng/services/models/luckdraw"
@@ -284,7 +283,7 @@ func (s *LuckdrawServ) DelLuckDraw(id string) error {
 		utils.LogError("获取游戏信息失败: " + err.Error())
 		return errors.New("获取游戏信息失败")
 	}
-	if ld.Status != models.STATUS_NORMAL {
+	if ld.Status != models.STATUS_READY {
 		return errors.New("游戏状态异常，请刷新后重试！")
 	}
 	var luckdraw = model.TaLuckdraw{
@@ -330,38 +329,38 @@ func (s *LuckdrawServ) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuc
 	}
 
 	// 推送微信消息
-	userMap := s.ctx.Get("userMap").(model.TaUserMapping)
-	userCases := s.ctx.Get("cases").([]model.SysUserCase)
-	clienturl := s.ctx.Get("clienturl").(string)
-	tplID := s.ctx.Get("tplid").(string)
-
-	var caseName string
-	if userCases != nil && len(userCases) > 0 {
-		for _, cs := range userCases {
-			if cs.CaseId == recored.CaseId {
-				caseName = cs.CaseName
-				break
-			}
-		}
-	}
-
-	remarkTpl := "请在%s日前, 前往%s兑换"
-
-	message := utils.Message{
-		To: utils.ClientID{ID: userMap.Openid},
-		Data: map[string]interface{}{
-			"orgid": recored.OrgId,
-			"tplid": tplID,
-			"link":  clienturl,
-			"data": map[string]string{
-				"first":    "抢券成功提醒",
-				"keyword1": prize.PrizeName,
-				"keyword2": time.Now().Local().Format("2006-01-02"),
-				"remark":   fmt.Sprintf(remarkTpl, recored.VerificationEnd.Format("2006-01-02"), caseName),
-			},
-		},
-	}
-	go utils.SendWechat(message)
+	// userMap := s.ctx.Get("userMap").(model.TaUserMapping)
+	// userCases := s.ctx.Get("cases").([]model.SysUserCase)
+	// clienturl := s.ctx.Get("clienturl").(string)
+	// tplID := s.ctx.Get("tplid").(string)
+
+	// var caseName string
+	// if userCases != nil && len(userCases) > 0 {
+	// 	for _, cs := range userCases {
+	// 		if cs.CaseId == recored.CaseId {
+	// 			caseName = cs.CaseName
+	// 			break
+	// 		}
+	// 	}
+	// }
+
+	// remarkTpl := "请在%s日前, 前往%s兑换"
+
+	// message := utils.Message{
+	// 	To: utils.ClientID{ID: userMap.Openid},
+	// 	Data: map[string]interface{}{
+	// 		"orgid": recored.OrgId,
+	// 		"tplid": tplID,
+	// 		"link":  clienturl,
+	// 		"data": map[string]string{
+	// 			"first":    "抢券成功提醒",
+	// 			"keyword1": prize.PrizeName,
+	// 			"keyword2": time.Now().Local().Format("2006-01-02"),
+	// 			"remark":   fmt.Sprintf(remarkTpl, recored.VerificationEnd.Format("2006-01-02"), caseName),
+	// 		},
+	// 	},
+	// }
+	// go utils.SendWechat(message)
 
 	return prize, prizeDetail, nil
 }