抽奖

controllers/luckdrawlist/luckdrawlist.go

@@ -1,6 +1,7 @@
 package luckdrawlist
 
 import (
+	"errors"
 	"spaceofcheng/services/controllers"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/luckdrawlist"
@@ -52,8 +53,8 @@ func (c *LuckdrawlistController) GetLuckShareList() {
 	if pagesize <= 0 {
 		pagesize = 10
 	}
-	toPhone := c.GetString(":toPhone")
-	fromPhone := c.GetString(":fromPhone")
+	toPhone := c.GetString("toPhone")
+	fromPhone := c.GetString("fromPhone")
 	list, total, err := c.dao.GetLuckShareList(caseid, fromPhone, toPhone, page, pagesize)
 	if err != nil {
 		c.ResponseError(err)
@@ -69,6 +70,9 @@ func (c *LuckdrawlistController) GetLuckShareList() {
 
 func (c *LuckdrawlistController) GetVerifyList() {
 	luckdrawId := c.GetString(":luckdrawId")
+	if luckdrawId == "" {
+		c.ResponseError(errors.New("无效二维码"))
+	}
 	luckdraw, err := c.dao.GetVerifyList(luckdrawId)
 	if err != nil {
 		c.ResponseError(err)
@@ -80,6 +84,9 @@ func (c *LuckdrawlistController) VerifyLuckdraw() {
 	sysUser := c.Context.Get("user").(model.SysUser)
 	userId := sysUser.UserId
 	luckdrawId := c.GetString("luckdrawId")
+	if luckdrawId == "" {
+		c.ResponseError(errors.New("无效二维码"))
+	}
 	err := c.dao.VerifyLuckdraw(luckdrawId, userId)
 	if err != nil {
 		c.ResponseError(err)

models/luckdrawlist/luckdrawlist.go

@@ -128,7 +128,8 @@ func (m *LuckdrawDAO) VerifyLuckdraw(luckdrawId string) error {
 }
 
 func (m *LuckdrawDAO) AddWriteoffRecord(luckdraw *Luckdraw, userId string) error {
-	var luckWriteoff model.TaLuckdrawWriteoff
+	var luckWriteoff = model.TaLuckdrawWriteoff{}
+	luckWriteoff.Id = utils.GetGUID()
 	luckWriteoff.CaseId = luckdraw.CaseId
 	luckWriteoff.LuckdrawId = luckdraw.LuckdrawId
 	luckWriteoff.OrgId = luckdraw.OrgId

routers/common.go

@@ -11,6 +11,7 @@ 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"
@@ -186,11 +187,11 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/gymcard/:gymcardId/:customerId", &gymcard.GymcardController{}, "post:VerifyCustomerGymcard"),
 		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"),
+		//luckdrawlist 抽奖
+		beego.NSRouter("luckdrawlist", &luckdrawlist.LuckdrawlistController{}, "get:GetLuckdrawList"),
+		beego.NSRouter("luckdrawlist/share", &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"),

service/luckdrawlist/luckdrawlist.go

@@ -6,6 +6,8 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strings"
+
+	"github.com/astaxie/beego"
 )
 
 // LuckdrawlistServ 系统处理
@@ -29,7 +31,7 @@ func (s *LuckdrawlistServ) GetLuckShareList(caseID, fromPhone, toPhone string, p
 		}
 
 		filters = []string{
-			"case_id='" + caseID + "'",
+			"a.case_id='" + caseID + "'",
 		}
 	} else {
 		casesRaw := s.ctx.Get("cases")
@@ -44,15 +46,15 @@ func (s *LuckdrawlistServ) GetLuckShareList(caseID, fromPhone, toPhone string, p
 		}
 
 		filters = []string{
-			"case_id in ('" + strings.Join(caseIDs, "','") + "')",
+			"a.case_id in ('" + strings.Join(caseIDs, "','") + "')",
 		}
 	}
 
 	limit := utils.GetPageNaviLimit(pagenavi...)
 	res, total, err := s.dao.GetLuckShareList(fromPhone, toPhone, filters, limit)
 	if err != nil {
-		utils.LogError("查询卡列表失败: " + err.Error())
-		return nil, 0, errors.New("查询卡列表失败")
+		utils.LogError("查询分享列表失败: " + err.Error())
+		return nil, 0, errors.New("查询分享列表失败")
 	}
 
 	return res, total, nil
@@ -114,6 +116,7 @@ func (s *LuckdrawlistServ) VerifyLuckdraw(luckdrawId, userId string) error {
 		utils.LogError("核销失败: " + err.Error())
 		return errors.New("核销失败")
 	}
+	beego.Error(luckdraw)
 	err = s.dao.AddWriteoffRecord(luckdraw, userId)
 	if err != nil {
 		utils.LogError("核销失败: " + err.Error())