From c277b3cabae122e09db8e203f21b3552cb5fd85b Mon Sep 17 00:00:00 2001
From: tommy <3405129587@qq.com>
Date: Thu, 14 May 2020 16:43:25 +0800
Subject: [PATCH] lottery

---
 controllers/common/wechat_oauth.go | 2 +-
 controllers/pc/lottery_draw.go     | 1 -
 services/im/im.go                  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/controllers/common/wechat_oauth.go b/controllers/common/wechat_oauth.go
index c2aa398..3f41b47 100644
--- a/controllers/common/wechat_oauth.go
+++ b/controllers/common/wechat_oauth.go
@@ -73,7 +73,7 @@ var counter = new(atomic.Int64)
 func (t *WeChatOauthCtl) CallbackOrder() {
 	counter.Add(1)
 	//搜索支付的order表， 查找到某条记录
-	order, err := pay_service.NotifyOrder(t.Request.OriginRequest.Body)
+	_, err := pay_service.NotifyOrder(t.Request.OriginRequest.Body)
 	if err != nil {
 		logger.Error(fmt.Sprintf("出现错误: %v", err))
 		return
diff --git a/controllers/pc/lottery_draw.go b/controllers/pc/lottery_draw.go
index b5bd2ac..8e4cda0 100644
--- a/controllers/pc/lottery_draw.go
+++ b/controllers/pc/lottery_draw.go
@@ -282,7 +282,6 @@ func (t *LotteryDrawCtl) Lottery() {
 	exist, err = models.GetById(rule, ruleId)
 	t.CheckErr(err)
 	t.Assert(exist, code.MSG_DATA_NOT_EXIST, "抽奖规则不存在")
-	//t.CheckRunning(rule.LotteryDrawStatus)
 
 	// 查询奖品
 	ladder := new(models.LotteryDrawRuleLadder)
diff --git a/services/im/im.go b/services/im/im.go
index 2420871..c369e7d 100644
--- a/services/im/im.go
+++ b/services/im/im.go
@@ -20,7 +20,7 @@ const NoticeShakeRedPackStart NoticeStatus = 259 // 通知摇红包开始了
 const NoticeShakeRedPackEnd NoticeStatus = 260   // 通知摇红包结束了
 const NoticeReward NoticeStatus = 261            // 打赏
 const NoticeLotteryDrawStart = 262               // 抽奖开始
-const NoticeLotteryDrawStop = 263                // 抽奖开始
+const NoticeLotteryDrawStop = 263                // 抽奖结束
 const NoticeLotteryDrawResult = 264              // 抽奖结果
 
 func SendNoticeByActivityId(activityId int64, _type NoticeStatus, data map[string]interface{}, members ...string) error {