抽奖修改

controllers/bodycheck/wechat.go

@@ -1,177 +0,0 @@
-package bodycheck
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"io/ioutil"
-	"net/http"
-	"strings"
-
-	"github.com/astaxie/beego"
-	"github.com/astaxie/beego/config"
-)
-
-// WechatInfo 微信接入
-func (c *BodyCheckController) WechatInfo() {
-	// signature := c.GetString("signature")
-	// timestamp := c.GetString("timestamp")
-	// nonce := c.GetString("nonce")
-	echostr := c.GetString("echostr")
-	c.ResponseRaw([]byte(echostr))
-}
-
-// GetQrcodeURL 获取二维码信息
-func (c *BodyCheckController) GetQrcodeURL() {
-	EquipmentID := c.GetString("EquipmentId")
-	qrcodePrefix := beego.AppConfig.String("qrcodePrefix")
-	qrcode, err := c.weixin.GetTempStrQRCode(qrcodePrefix + EquipmentID)
-	if err != nil {
-		c.ResponseJson(map[string]interface{}{
-			"Status":  false,
-			"Message": err.Error(),
-		})
-	}
-	c.ResponseJson(map[string]interface{}{
-		"Status":    true,
-		"Message":   "",
-		"QrcodeUrl": qrcode,
-	})
-}
-
-// WxReceive 微信消息接收
-func (c *BodyCheckController) WxReceive() {
-	r := c.Ctx.Request
-	defer r.Body.Close()
-	con, _ := ioutil.ReadAll(r.Body) //获取post的数据
-	val, err := c.weixin.TransformMessage(string(con))
-	if err != nil {
-		beego.Error(err.Error())
-		c.ResponseRaw([]byte(""))
-	}
-
-	if val["MsgType"] == "event" {
-		qrcodePrefix := beego.AppConfig.String("qrcodePrefix")
-		if (val["Event"] == "subscribe" && strings.Contains(val["EventKey"], "qrscene_"+qrcodePrefix)) || val["Event"] == "SCAN" {
-			EquipmentID := strings.Split(val["EventKey"], qrcodePrefix)[1]
-			messagetxt, err := c.scanDo(val, EquipmentID)
-			if err != nil {
-				beego.Error(err.Error())
-				c.ResponseRaw([]byte(""))
-			}
-			c.ResponseRaw(messagetxt)
-		}
-	}
-	c.ResponseRaw([]byte(""))
-}
-
-func (c *BodyCheckController) scanDo(val map[string]string, EquipmentID string) ([]byte, error) {
-	if val["FromUserName"] == "" {
-		return nil, errors.New("openid为空")
-	}
-
-	user, err := c.weixin.GetUserDetail(val["FromUserName"])
-	if err != nil {
-		return nil, err
-	}
-
-	// 判断用户是否存在
-	getUser, err := c.dao.GetUserByOpenID(user["openid"].(string))
-	if err != nil {
-		return nil, err
-	}
-	name := user["nickname"].(string)
-	name = UnicodeEmojiCode(name)
-	user["nickname"] = name
-	if getUser == nil || getUser.Id < 1 {
-		// 新增用户
-		var newUser = model.CustomerUser{}
-		newUser.Username = name
-		newUser.WcNickname = name
-		sex := int(user["sex"].(float64))
-		if sex == 2 {
-			sex = 1
-		} else {
-			sex = 0
-		}
-		newUser.Sex = sex
-		newUser.OpenId = user["openid"].(string)
-		newUser.Icon = user["headimgurl"].(string)
-		newUser.UserType = 4
-		newUser.ActualBalance = "0.00"
-		newUser.GiftBalance = "0.00"
-		_, err = c.dao.SaveUser(newUser)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	type WechatInfo struct {
-		EquipmentId    string
-		WXID           int
-		WechatUserInfo map[string]interface{}
-	}
-	wxconf, _ := config.NewConfig("ini", "conf/wechat.conf")
-	user["wechataccount"] = user["openid"].(string)
-	user["wechatofficial"] = wxconf.String("appid")
-	var userinfo = WechatInfo{}
-	userinfo.EquipmentId = EquipmentID
-	userinfo.WechatUserInfo = user
-	userinfo.WXID = 1
-
-	apiPrefix := beego.AppConfig.String("postwechatInfo")
-
-	b, err := json.Marshal(userinfo)
-	if err != nil {
-		return nil, err
-	}
-
-	body := bytes.NewBuffer([]byte(b))
-	beego.Error(body)
-	res, err := http.Post(apiPrefix, "application/json;charset=utf-8", body)
-	if err != nil {
-		beego.Error(err)
-		return nil, err
-	}
-	result, err := ioutil.ReadAll(res.Body)
-	res.Body.Close()
-	if err != nil {
-		beego.Error(err)
-		return nil, err
-	}
-	var postResult struct {
-		Status  bool
-		Message string
-	}
-	if err = json.Unmarshal(result, &postResult); err != nil {
-		beego.Error(err)
-		return nil, err
-	}
-
-	if !postResult.Status {
-		beego.Error(postResult.Message)
-		return nil, errors.New(postResult.Message)
-	}
-
-	messagetxt, err := c.weixin.ResponseMessageText(user["openid"].(string), beego.AppConfig.String("followText"))
-	if err != nil {
-		beego.Error(err)
-		return nil, err
-	}
-	return messagetxt, nil
-}
-
-// UnicodeEmojiCode 过滤表情
-func UnicodeEmojiCode(s string) string {
-	ret := ""
-	rs := []rune(s)
-	for i := 0; i < len(rs); i++ {
-		if len(string(rs[i])) == 4 {
-			// u := `[\u` + strconv.FormatInt(int64(rs[i]), 16) + `]`
-			ret += ""
-		} else {
-			ret += string(rs[i])
-		}
-	}
-	return ret
-}

log/common.log

@@ -342,3 +342,7 @@
 2018/09/16 22:33:10 [E] 用户没有设置默认案场
 2018/09/16 22:33:16 [E] 用户没有设置默认案场
 2018/09/16 22:33:58 [E] 用户没有设置默认案场
+2018/09/16 23:14:52 [E] 用户没有设置默认案场
+2018/09/16 23:15:52 [E] 用户没有设置默认案场
+2018/09/16 23:15:55 [E] 用户没有设置默认案场
+2018/09/16 23:15:55 [E] 用户没有设置默认案场

models/luckdraw/luckdraw.go

@@ -1,6 +1,7 @@
 package luckdraw
 
 import (
+	"errors"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
@@ -10,28 +11,20 @@ import (
 	"github.com/go-xorm/xorm"
 )
 
-const (
-	StatusNormal = 1
-)
-
-// DAO 当前数据库操作对象
-type DAO struct {
+// LuckDrawDao 当前数据库操作对象
+type LuckDrawDao struct {
 	ctx *utils.Context
 	db  *xorm.Session
 }
 
 // NewDAO 初始化DAO
-func NewDAO(ctx *utils.Context) *DAO {
-	return &DAO{
+func NewDAO(ctx *utils.Context) *LuckDrawDao {
+	return &LuckDrawDao{
 		ctx: ctx,
 		db:  ctx.DB,
 	}
 }
 
-const (
-	STATUS_NOWRITROFF = 0
-)
-
 // LuckDraw 抽奖记录
 type LuckDraw struct {
 	model.TaLuckdraw `xorm:"extends"`
@@ -39,101 +32,110 @@ type LuckDraw struct {
 }
 
 // GetLuckDraw 获取抽奖信息
-func (m *DAO) GetLuckDraw(id int) (*LuckDraw, error) {
-	if id == 0 {
-		return nil, utils.LogError("不存在抽奖信息！")
+func (m *LuckDrawDao) GetLuckDraw(id string) (*LuckDraw, error) {
+	if id == "" {
+		return nil, errors.New("不存在抽奖信息！")
 	}
-
 	luckdraw, err := m.GetLuckDrawByID(id)
 	if err != nil {
-		return nil, err
+		utils.LogError("获取抽奖信息失败：", err)
+		return nil, errors.New("获取抽奖信息失败")
 	}
 	prizes, err := m.GetPrizes(id)
 	if err != nil {
-		return nil, err
+		utils.LogError("获取奖品信息失败：", err)
+		return nil, errors.New("获取奖品信息失败")
 	}
 	luckdraw.Prizes = prizes
 	return luckdraw, nil
 }
 
 // LuckDraw 抽奖
-func (m *DAO) LuckDraw(id int, user *model.TaCustomer) (*model.TaLuckdrawPrize, *model.TaPrizeDetail, error) {
+func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuckdrawPrize, *model.TaPrizeDetail, error) {
 	luckdraw, err := m.GetLuckDrawByID(id)
 	if err != nil {
-		return nil, nil, utils.LogError("获取抽奖信息失败！", err)
+		return nil, nil, errors.New("获取抽奖信息失败！")
 	}
 	if luckdraw.Status != models.STATUS_NORMAL {
-		return nil, nil, utils.LogError("当前抽奖活动状态异常！")
+		return nil, nil, errors.New("当前抽奖活动状态异常！")
 	}
 	if time.Now().Before(luckdraw.BeginDate) {
-		return nil, nil, utils.LogError("活动还未开始！")
+		return nil, nil, errors.New("活动还未开始！")
 	}
 	if time.Now().After(luckdraw.EndDate) {
-		return nil, nil, utils.LogError("活动已结束！")
+		return nil, nil, errors.New("活动已结束！")
 	}
 	if user.Phone != "" {
 		sysuser, err := m.GetUserByTel(user.Phone)
 		if err != nil {
-			return nil, nil, utils.LogError("获取信息失败！", err)
+			return nil, nil, errors.New("获取信息失败！")
 		}
 		if sysuser != nil {
-			return nil, nil, utils.LogError("内部人员不允许进行抽奖！")
+			return nil, nil, errors.New("内部人员不允许进行抽奖！")
 		}
 	}
 	userluckdraws, err := m.GetUserRecordByLuckDraw(user.CustomerId, id)
 	if err != nil {
-		return nil, nil, utils.LogError("获取用户抽奖信息失败！", err)
+		utils.LogError("获取用户抽奖信息失败:", err)
+		return nil, nil, errors.New("获取用户抽奖信息失败！")
 	}
 	if len(userluckdraws) > 0 {
-		return nil, nil, utils.LogError("您已参与过此次抽奖，不允许重复抽奖！")
+		return nil, nil, errors.New("您已参与过此次抽奖，不允许重复抽奖！")
 	}
 	prizes, err := m.GetPrizeStock(id)
 	if err != nil {
-		return nil, nil, utils.LogError("获取奖项失败！", err)
+		utils.LogError("获取奖项失败:", err)
+		return nil, nil, errors.New("获取奖项失败！")
 	}
 	if len(prizes) == 0 {
 		err = m.UpdateLuckDrawEndDate(luckdraw.Id)
 		if err != nil {
-			return nil, nil, utils.LogError("操作失败，请刷新后重试！", err)
+			utils.LogError("操作失败，请刷新后重试:", err)
+			return nil, nil, errors.New("操作失败，请刷新后重试！")
 		}
-		return nil, nil, utils.LogError("活动已结束！")
+		return nil, nil, errors.New("活动已结束！")
 	}
 	prize, err := m.GetWinning(prizes)
 	if err != nil {
-		return nil, nil, utils.LogError("获取奖项失败！", err)
+		utils.LogError("获取奖项失败:", err)
+		return nil, nil, errors.New("获取奖项失败！")
 	}
 
-	details, err := m.GetPrizeDetail(prize.Id)
-	if err != nil {
-		return nil, nil, utils.LogError("获取奖项详情失败！", err)
-	}
+	// details, err := m.GetPrizeDetail(prize.Id)
+	// if err != nil {
+	// 	utils.LogError("获取奖项详情失败:", err)
+	// 	return nil, nil, errors.New("获取奖项详情失败！")
+	// }
 
 	// 保存中奖记录
 	var record = model.TaLuckdrawRecord{}
+	record.Id = utils.GetGUID()
 	record.OrgId = luckdraw.OrgId
 	record.CaseId = luckdraw.CaseId
 	record.PrizeId = prize.Id
 	record.PrizeName = prize.PrizeName
 	record.UserId = user.CustomerId
-	record.UserName = user.Name
+	record.UserName = user.CustomerName
 	record.UserHeadImg = user.Headimgurl
 	record.LuckdrawId = luckdraw.Id
-	newrecord, err := m.SaveRecord(record)
-	var detail = model.TaPrizeDetail{}
-	if len(details) > 0 {
-		// 更新中奖纪录明细
-		details[0].ReceiveId = newrecord.Id
-		err = m.UpdatePrizeDetail(details[0])
-		if err != nil {
-			return nil, nil, utils.LogError("操作失败！", err)
-		}
-		detail = details[0]
-		// 奖项自动核销，走卡券核销流程
-		err = m.PrizeWriteOff(newrecord.Id, user.CustomerId)
-		if err != nil {
-			return nil, nil, utils.LogError("操作失败！", err)
-		}
-	}
+	_, err = m.SaveRecord(record)
+	// var detail = model.TaPrizeDetail{}
+	// if len(details) > 0 {
+	// 	// 更新中奖纪录明细
+	// 	details[0].ReceiveId = newrecord.Id
+	// 	err = m.UpdatePrizeDetail(details[0])
+	// 	if err != nil {
+	// 		utils.LogError("更新中奖纪录明细失败:", err)
+	// 		return nil, nil, errors.New("操作失败！")
+	// 	}
+	// 	detail = details[0]
+	// 	// 奖项自动核销，走卡券核销流程
+	// 	err = m.PrizeWriteOff(newrecord.Id, user.CustomerId)
+	// 	if err != nil {
+	// 		utils.LogError("卡券核销失败:", err)
+	// 		return nil, nil, errors.New("操作失败！")
+	// 	}
+	// }
 	// 更新库存
 	if prize.IsReality == 1 {
 		prize.Remainder = prize.Remainder - 1
@@ -143,7 +145,8 @@ func (m *DAO) LuckDraw(id int, user *model.TaCustomer) (*model.TaLuckdrawPrize,
 		}
 		stockprizes, err := m.GetPrizeStock(id)
 		if err != nil {
-			return nil, nil, utils.LogError("操作失败，请刷新后重试！", err)
+			utils.LogError("更新库存失败:", err)
+			return nil, nil, errors.New("操作失败，请刷新后重试！")
 		}
 		if len(stockprizes) == 0 {
 			// 更新活动截止时间
@@ -151,11 +154,11 @@ func (m *DAO) LuckDraw(id int, user *model.TaCustomer) (*model.TaLuckdrawPrize,
 		}
 	}
 
-	return prize, &detail, err
+	return prize, nil, err
 }
 
 // PrizeWriteOff 奖品核销
-func (m *DAO) PrizeWriteOff(recordid int, userid string) error {
+func (m *LuckDrawDao) PrizeWriteOff(recordid, userid string) error {
 	record, err := m.GetRecordByID(recordid)
 	if err != nil {
 		return err
@@ -175,7 +178,7 @@ func (m *DAO) PrizeWriteOff(recordid int, userid string) error {
 }
 
 // GetWinning 获取中奖信息
-func (m *DAO) GetWinning(prizes []model.TaLuckdrawPrize) (*model.TaLuckdrawPrize, error) {
+func (m *LuckDrawDao) GetWinning(prizes []model.TaLuckdrawPrize) (*model.TaLuckdrawPrize, error) {
 	pList := make([]map[string]interface{}, 0)
 	now := time.Now().Local()
 
@@ -192,7 +195,7 @@ func (m *DAO) GetWinning(prizes []model.TaLuckdrawPrize) (*model.TaLuckdrawPrize
 	}
 
 	if len(pList) == 0 {
-		return nil, utils.LogError("所有奖品已抽完")
+		return nil, errors.New("所有奖品已抽完")
 	}
 
 	thePrize := utils.LuckyDraw(pList).(model.TaLuckdrawPrize)
@@ -201,7 +204,7 @@ func (m *DAO) GetWinning(prizes []model.TaLuckdrawPrize) (*model.TaLuckdrawPrize
 }
 
 // GetLuckDrawByID 获取抽奖信息
-func (m *DAO) GetLuckDrawByID(id int) (*LuckDraw, error) {
+func (m *LuckDrawDao) GetLuckDrawByID(id string) (*LuckDraw, error) {
 	var luckdraws []LuckDraw
 	sql := `select * from ta_luckdraw where id= ?`
 	err := m.db.SQL(sql, id).Find(&luckdraws)
@@ -214,32 +217,8 @@ func (m *DAO) GetLuckDrawByID(id int) (*LuckDraw, error) {
 	return nil, nil
 }
 
-// GetCaseAddressByLuckDarw 获取案场地址
-func (m *DAO) GetCaseAddressByLuckDarw(luckdraw int) (string, error) {
-	sql := `
-		SELECT
-			t.address
-		FROM
-			sys_case t
-		INNER JOIN ta_luckdraw s ON t.case_id = s.case_id
-		WHERE
-			s.id = ?
-	`
-
-	res, err := m.db.Query(sql, luckdraw)
-	if err != nil {
-		return "", err
-	}
-
-	if res == nil || len(res) == 0 {
-		return "", nil
-	}
-
-	return string(res[0]["address"]), nil
-}
-
 // UpdateLuckDrawEndDate 更新活动结束时间
-func (m *DAO) UpdateLuckDrawEndDate(id int) error {
+func (m *LuckDrawDao) UpdateLuckDrawEndDate(id string) error {
 	var luckdraw = model.TaLuckdraw{
 		Id:      id,
 		EndDate: time.Now(),
@@ -252,14 +231,14 @@ func (m *DAO) UpdateLuckDrawEndDate(id int) error {
 }
 
 // GetPrizes 获取奖品信息
-func (m *DAO) GetPrizes(luckdrawid int) ([]model.TaLuckdrawPrize, error) {
+func (m *LuckDrawDao) GetPrizes(luckdrawid string) ([]model.TaLuckdrawPrize, error) {
 	var prizes []model.TaLuckdrawPrize
 	err := m.db.Where("luckdraw_id=?", luckdrawid).And("status=?", models.STATUS_NORMAL).Find(&prizes)
 	return prizes, err
 }
 
 // UpdateStock 修改库存
-func (m *DAO) UpdateStock(prize *model.TaLuckdrawPrize) error {
+func (m *LuckDrawDao) UpdateStock(prize *model.TaLuckdrawPrize) error {
 	cols := []string{
 		"remainder",
 	}
@@ -268,36 +247,44 @@ func (m *DAO) UpdateStock(prize *model.TaLuckdrawPrize) error {
 }
 
 // GetPrizeStock 判断奖项库存
-func (m *DAO) GetPrizeStock(luckdrawid int) ([]model.TaLuckdrawPrize, error) {
+func (m *LuckDrawDao) GetPrizeStock(luckdrawid string) ([]model.TaLuckdrawPrize, error) {
 	var prizes []model.TaLuckdrawPrize
 	err := m.db.Where("luckdraw_id=?", luckdrawid).And("status=?", models.STATUS_NORMAL).And("(remainder>0 or is_reality=0)").Find(&prizes)
 	return prizes, err
 }
 
 // GetPrizeByID 根据id获取奖品信息
-func (m *DAO) GetPrizeByID(id int) (model.TaLuckdrawPrize, error) {
+func (m *LuckDrawDao) GetPrizeByID(id int) (model.TaLuckdrawPrize, error) {
 	var prize = model.TaLuckdrawPrize{}
 	_, err := m.db.Where("id=?", id).Get(&prize)
 	return prize, err
 }
 
 // SaveRecord 保存抽奖记录
-func (m *DAO) SaveRecord(record model.TaLuckdrawRecord) (*model.TaLuckdrawRecord, error) {
+func (m *LuckDrawDao) SaveRecord(record model.TaLuckdrawRecord) (*model.TaLuckdrawRecord, error) {
 	record.CreateDate = time.Now()
-	record.Status = STATUS_NOWRITROFF
+	record.Status = models.STATUS_READY
+	record.Id = utils.GetGUID()
 	_, err := m.db.Insert(&record)
 	return &record, err
 }
 
+// GetUserByTel 根据电话获取用户信息
+func (m *LuckDrawDao) GetUserByTel(tel string) (*model.SysUser, error) {
+	var user = model.SysUser{}
+	_, err := m.db.Where("phone=?", tel).Get(&user)
+	return &user, err
+}
+
 // GetPrizeDetail 获取未领取的奖品详情
-func (m *DAO) GetPrizeDetail(prizeid int) ([]model.TaPrizeDetail, error) {
+func (m *LuckDrawDao) GetPrizeDetail(prizeid string) ([]model.TaPrizeDetail, error) {
 	var details []model.TaPrizeDetail
-	err := m.db.Where("prize_id=?", prizeid).And("status=?", STATUS_NOWRITROFF).Find(&details)
+	err := m.db.Where("prize_id=?", prizeid).And("status=?", models.STATUS_READY).Find(&details)
 	return details, err
 }
 
 // UpdatePrizeDetail 更新库存明细为已领取
-func (m *DAO) UpdatePrizeDetail(detail model.TaPrizeDetail) error {
+func (m *LuckDrawDao) UpdatePrizeDetail(detail model.TaPrizeDetail) error {
 	detail.Status = models.STATUS_NORMAL
 	detail.ReceiveDate = time.Now()
 	cols := []string{
@@ -310,7 +297,7 @@ func (m *DAO) UpdatePrizeDetail(detail model.TaPrizeDetail) error {
 }
 
 // UpdateRecord 核销更新抽奖记录表
-func (m *DAO) UpdateRecord(record *model.TaLuckdrawRecord) error {
+func (m *LuckDrawDao) UpdateRecord(record *model.TaLuckdrawRecord) error {
 	record.Status = models.STATUS_NORMAL
 	record.WriteoffDate = time.Now()
 	cols := []string{
@@ -322,22 +309,23 @@ func (m *DAO) UpdateRecord(record *model.TaLuckdrawRecord) error {
 }
 
 // SaveWirteOff 保存核销信息
-func (m *DAO) SaveWirteOff(writeoff model.TaLuckdrawWriteoff) (*model.TaLuckdrawWriteoff, error) {
+func (m *LuckDrawDao) SaveWirteOff(writeoff model.TaLuckdrawWriteoff) (*model.TaLuckdrawWriteoff, error) {
 	writeoff.Status = models.STATUS_NORMAL
+	writeoff.Id = utils.GetGUID()
 	writeoff.WriteoffDate = time.Now()
 	_, err := m.db.Insert(&writeoff)
 	return &writeoff, err
 }
 
 // GetUserRecordByLuckDraw 获取用户的抽奖信息
-func (m *DAO) GetUserRecordByLuckDraw(userid string, luckdrawid int) ([]model.TaLuckdrawRecord, error) {
+func (m *LuckDrawDao) GetUserRecordByLuckDraw(userid string, luckdrawid string) ([]model.TaLuckdrawRecord, error) {
 	var records []model.TaLuckdrawRecord
 	err := m.db.Where("user_id=?", userid).And("luckdraw_id=?", luckdrawid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&records)
 	return records, err
 }
 
 // GetUserLuckDrawByLuckDraw 获取用户的抽奖信息
-func (m *DAO) GetUserLuckDrawByLuckDraw(userid string, luckdrawid int) (*model.TaLuckdrawRecord, error) {
+func (m *LuckDrawDao) GetUserLuckDrawByLuckDraw(userid string, luckdrawid string) (*model.TaLuckdrawRecord, error) {
 	var records []model.TaLuckdrawRecord
 	err := m.db.Where("user_id=?", userid).And("luckdraw_id=?", luckdrawid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&records)
 	if err != nil {
@@ -350,7 +338,7 @@ func (m *DAO) GetUserLuckDrawByLuckDraw(userid string, luckdrawid int) (*model.T
 }
 
 // GetDetailByRecord 获取detail
-func (m *DAO) GetDetailByRecord(recordid int) (*model.TaPrizeDetail, error) {
+func (m *LuckDrawDao) GetDetailByRecord(recordid string) (*model.TaPrizeDetail, error) {
 	var details []model.TaPrizeDetail
 	err := m.db.Where("receive_id=?", recordid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&details)
 	if err != nil {
@@ -369,7 +357,7 @@ type UserRecord struct {
 }
 
 // GetUserLuckDraw 获取用户的抽奖信息
-func (m *DAO) GetUserLuckDraw(userid string) ([]UserRecord, error) {
+func (m *LuckDrawDao) GetUserLuckDraw(userid string) ([]UserRecord, error) {
 	var records []UserRecord
 	sql := `select a.*,b.url from ta_luckdraw_record a left join ta_prize_detail b on a.id=b.receive_id where a.user_id=? and a.status>` + strconv.Itoa(models.STATUS_DEL)
 	err := m.db.Sql(sql, userid).Find(&records)
@@ -377,49 +365,24 @@ func (m *DAO) GetUserLuckDraw(userid string) ([]UserRecord, error) {
 }
 
 // GetRecordByLuckDraw 抽奖记录
-func (m *DAO) GetRecordByLuckDraw(luckdrawid int) ([]model.TaLuckdrawRecord, error) {
+func (m *LuckDrawDao) GetRecordByLuckDraw(luckdrawid string) ([]model.TaLuckdrawRecord, error) {
 	var records []model.TaLuckdrawRecord
 	err := m.db.Where("luckdraw_id=?", luckdrawid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Desc("create_date").Find(&records)
 	return records, err
 }
 
 // GetRecordByID 获取抽奖记录明细
-func (m *DAO) GetRecordByID(id int) (*model.TaLuckdrawRecord, error) {
+func (m *LuckDrawDao) GetRecordByID(id string) (*model.TaLuckdrawRecord, error) {
 	var record model.TaLuckdrawRecord
 	_, err := m.db.Where("id=?", id).Get(&record)
 	return &record, err
 }
 
-// GetUserByOpenID 根据 openid 获取用户人员信息
-func (m *DAO) GetUserByOpenID(openid string) (*model.SysUser, error) {
-	var users []model.SysUser
-	err := m.db.Where("open_id=?", openid).Find(&users)
-	if err != nil {
-		return nil, err
-	}
-	if len(users) > 0 {
-		return &users[0], nil
-	}
-	return nil, nil
-}
-
-// GetUserByTel 根据 Tel 获取用户人员信息
-func (m *DAO) GetUserByTel(tel string) (*model.SysUser, error) {
-	var users = model.SysUser{}
-	has, err := m.db.Where("phone=?", tel).Get(&users)
-	if err != nil {
-		return nil, err
-	}
-	if !has {
-		return nil, nil
-	}
-	return &users, nil
-}
-
 // SaveLuckDrawShareData 保存用户分享信息
-func (m *DAO) SaveLuckDrawShareData(dt *model.TaShareLuckyRecord) error {
+func (m *LuckDrawDao) SaveLuckDrawShareData(dt *model.TaShareLuckyRecord) error {
 	dt.CreateDate = time.Now().Local()
-	dt.Status = StatusNormal
+	dt.Status = models.STATUS_NORMAL
+	dt.Id = utils.GetGUID()
 
 	if _, err := m.db.Insert(dt); err != nil {
 		return err
@@ -429,14 +392,14 @@ func (m *DAO) SaveLuckDrawShareData(dt *model.TaShareLuckyRecord) error {
 }
 
 // GetLuckDrawShareData 获取用户分享内容
-func (m *DAO) GetLuckDrawShareData(luckID int, from, to, caseID string) ([]model.TaShareLuckyRecord, error) {
+func (m *LuckDrawDao) GetLuckDrawShareData(from, to, luckID, caseID int) ([]model.TaShareLuckyRecord, error) {
 	var dts []model.TaShareLuckyRecord
 
 	if err := m.db.Where("from_customer_id=?", from).
 		And("to_customer_id=?", to).
 		And("luckydraw_id=?", luckID).
 		And("case_id=?", caseID).
-		And("status=?", StatusNormal).
+		And("status=?", models.STATUS_NORMAL).
 		Find(&dts); err != nil {
 		return nil, err
 	}

models/model/ta_luckdraw.go

@@ -5,9 +5,9 @@ import (
 )
 
 type TaLuckdraw struct {
-	Id           int       `xorm:"not null pk autoincr INT(11)"`
+	Id           string    `xorm:"not null pk VARCHAR(64)"`
 	Name         string    `xorm:"VARCHAR(50)"`
-	ThemeId      int       `xorm:"INT(11)"`
+	ThemeId      string    `xorm:"VARCHAR(64)"`
 	LuckdrawRule string    `xorm:"TEXT"`
 	BeginDate    time.Time `xorm:"DATETIME"`
 	EndDate      time.Time `xorm:"DATETIME"`

models/model/ta_luckdraw_prize.go

@@ -5,8 +5,8 @@ import (
 )
 
 type TaLuckdrawPrize struct {
-	Id                int       `xorm:"not null pk autoincr INT(11)"`
-	LuckdrawId        int       `xorm:"INT(11)"`
+	Id                string    `xorm:"not null pk VARCHAR(64)"`
+	LuckdrawId        string    `xorm:"VARCHAR(64)"`
 	PrizeName         string    `xorm:"VARCHAR(50)"`
 	PrizeImg          string    `xorm:"TEXT"`
 	Stock             int       `xorm:"INT(11)"`

models/model/ta_luckdraw_record.go

@@ -5,9 +5,9 @@ import (
 )
 
 type TaLuckdrawRecord struct {
-	Id           int       `xorm:"not null pk autoincr INT(11)"`
-	LuckdrawId   int       `xorm:"INT(11)"`
-	PrizeId      int       `xorm:"INT(11)"`
+	Id           string    `xorm:"not null pk VARCHAR(64)"`
+	LuckdrawId   string    `xorm:"VARCHAR(64)"`
+	PrizeId      string    `xorm:"VARCHAR(64)"`
 	PrizeName    string    `xorm:"VARCHAR(50)"`
 	UserId       string    `xorm:"VARCHAR(64)"`
 	UserName     string    `xorm:"VARCHAR(50)"`

models/model/ta_luckdraw_writeoff.go

@@ -5,9 +5,9 @@ import (
 )
 
 type TaLuckdrawWriteoff struct {
-	Id           int       `xorm:"not null pk autoincr INT(11)"`
-	LuckdrawId   int       `xorm:"INT(11)"`
-	RecordId     int       `xorm:"INT(11)"`
+	Id           string    `xorm:"not null pk VARCHAR(64)"`
+	LuckdrawId   string    `xorm:"VARCHAR(64)"`
+	RecordId     string    `xorm:"VARCHAR(64)"`
 	WriteoffDate time.Time `xorm:"DATETIME"`
 	WriteoffUser string    `xorm:"VARCHAR(64)"`
 	Status       int       `xorm:"SMALLINT(6)"`

models/model/ta_prize_detail.go

@@ -5,10 +5,10 @@ import (
 )
 
 type TaPrizeDetail struct {
-	Id          int       `xorm:"not null pk autoincr INT(11)"`
-	PrizeId     int       `xorm:"INT(11)"`
+	Id          string    `xorm:"not null pk VARCHAR(64)"`
+	PrizeId     string    `xorm:"VARCHAR(64)"`
 	Url         string    `xorm:"TEXT"`
 	Status      int       `xorm:"SMALLINT(6)"`
-	ReceiveId   int       `xorm:"INT(11)"`
+	ReceiveId   string    `xorm:"VARCHAR(64)"`
 	ReceiveDate time.Time `xorm:"DATETIME"`
 }

models/model/ta_share_lucky_record.go

@@ -5,7 +5,7 @@ import (
 )
 
 type TaShareLuckyRecord struct {
-	Id                 int       `xorm:"not null pk autoincr INT(11)"`
+	Id                 string    `xorm:"not null pk VARCHAR(64)"`
 	FromCustomerId     string    `xorm:"VARCHAR(64)"`
 	FromCustomerName   string    `xorm:"VARCHAR(32)"`
 	FromCustomerWxname string    `xorm:"VARCHAR(64)"`
@@ -17,6 +17,6 @@ type TaShareLuckyRecord struct {
 	CreateDate         time.Time `xorm:"DATETIME"`
 	CaseId             string    `xorm:"VARCHAR(64)"`
 	Status             int       `xorm:"SMALLINT(6)"`
-	LuckydrawId        int       `xorm:"INT(11)"`
+	LuckydrawId        string    `xorm:"VARCHAR(64)"`
 	LuckydrawName      string    `xorm:"VARCHAR(128)"`
 }

models/model/td_luckdraw_theme.go

@@ -1,7 +1,7 @@
 package model
 
 type TdLuckdrawTheme struct {
-	Id        int    `xorm:"not null pk autoincr INT(11)"`
+	Id        string `xorm:"not null pk VARCHAR(64)"`
 	ThemeName string `xorm:"VARCHAR(50)"`
 	Status    int    `xorm:"SMALLINT(6)"`
 	OrgId     string `xorm:"VARCHAR(64)"`

routers/common.go

@@ -11,7 +11,6 @@ import (
 	"spaceofcheng/services/controllers/customer"
 	"spaceofcheng/services/controllers/goods"
 	"spaceofcheng/services/controllers/gymcard"
-	"spaceofcheng/services/controllers/luckdrawlist"
 	"spaceofcheng/services/controllers/marketing"
 	"spaceofcheng/services/controllers/message"
 	"spaceofcheng/services/controllers/statistics"
@@ -188,10 +187,11 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/gymcard/:id/to/:users", &gymcard.GymcardController{}, "post:GiveGymToCustomer"),
 
 		// luckdrawlist 抽奖
-		beego.NSRouter("luckdrawlist", &luckdrawlist.LuckdrawlistController{}, "get:GetLuckdrawList"),
-		beego.NSRouter("luckdrawlist/:toPhone/:fromPhone", &luckdrawlist.LuckdrawlistController{}, "get:GetLuckShareList"),
-		beego.NSRouter("luckdrawlist/:luckdrawId", &luckdrawlist.LuckdrawlistController{}, "get:GetVerifyList"),
-		beego.NSRouter("luckdrawlist/:luckdrawId", &luckdrawlist.LuckdrawlistController{}, "put:VerifyLuckdraw"),
+		// beego.NSRouter("luckdrawlist", &luckdrawlist.LuckdrawlistController{}, "get:GetLuckdrawList"),
+		// beego.NSRouter("luckdrawlist/:toPhone/:fromPhone", &luckdrawlist.LuckdrawlistController{}, "get:GetLuckShareList"),
+		// beego.NSRouter("luckdrawlist/:luckdrawId", &luckdrawlist.LuckdrawlistController{}, "get:GetVerifyList"),
+		// beego.NSRouter("luckdrawlist/:luckdrawId", &luckdrawlist.LuckdrawlistController{}, "put:VerifyLuckdraw"),
+
 		// bodychecklist 体检列表
 		beego.NSRouter("bodychecklist", &bodychecklist.BodychecklistController{}, "get:GetBodyCheckList"),
 		// role 角色

routers/wechat.go

@@ -8,7 +8,6 @@ import (
 	"spaceofcheng/services/controllers/customer"
 	"spaceofcheng/services/controllers/goods"
 	"spaceofcheng/services/controllers/gymcard"
-	"spaceofcheng/services/controllers/luckdraw"
 	"spaceofcheng/services/controllers/user"
 
 	"github.com/astaxie/beego"
@@ -78,12 +77,12 @@ func getWechatRoutes() beego.LinkNamespace {
 		beego.NSRouter("/GetQrcodeURL", &bodycheck.BodyCheckController{}, "get:GetQrcodeURL"),
 
 		// 抽奖
-		beego.NSRouter("/user", &luckdraw.LuckDrawController{}, "get:GetUserByCode"),
-		beego.NSRouter("/luckdraw/:id", &luckdraw.LuckDrawController{}, "get:GetLuckDraw"),
-		beego.NSRouter("/luckdraw/:id", &luckdraw.LuckDrawController{}, "post:LuckDraw"),
-		beego.NSRouter("/luckdraw/:id/share", &luckdraw.LuckDrawController{}, "post:SaveShareRecord"),
-		beego.NSRouter("/record", &luckdraw.LuckDrawController{}, "get:GetRecordByLuckDraw"),
-		beego.NSRouter("/user/record", &luckdraw.LuckDrawController{}, "get:GetUserLuckDraw"),
-		beego.NSRouter("/user/record/:id", &luckdraw.LuckDrawController{}, "get:GetRecordByID"),
+		// beego.NSRouter("/user", &luckdraw.LuckDrawController{}, "get:GetUserByCode"),
+		// beego.NSRouter("/luckdraw/:id", &luckdraw.LuckDrawController{}, "get:GetLuckDraw"),
+		// beego.NSRouter("/luckdraw/:id", &luckdraw.LuckDrawController{}, "post:LuckDraw"),
+		// beego.NSRouter("/luckdraw/:id/share", &luckdraw.LuckDrawController{}, "post:SaveShareRecord"),
+		// beego.NSRouter("/record", &luckdraw.LuckDrawController{}, "get:GetRecordByLuckDraw"),
+		// beego.NSRouter("/user/record", &luckdraw.LuckDrawController{}, "get:GetUserLuckDraw"),
+		// beego.NSRouter("/user/record/:id", &luckdraw.LuckDrawController{}, "get:GetRecordByID"),
 	)
 }