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

models/constant.go

@@ -170,4 +170,5 @@ const (
 // 二维码类型
 const (
 	QRCODE_TYPE_COURSE = "course"
+	QRCODE_TYPE_PRIZE  = "prize"
 )

models/course/course.go

@@ -2,7 +2,6 @@ package course
 
 import (
 	"errors"
-	"math/rand"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
@@ -532,19 +531,6 @@ func (m *CourseDAO) SaveCustomerCourseQrcode(qrcode *model.TaCustomerCourseQrcod
 	return err
 }
 
-// GenerateQRCode 生成二维码数字
-func (m *CourseDAO) GenerateQRCode() string {
-	var temp1 int = rand.Intn(9)*87 + 11
-	var temp2 int = rand.Intn(9)*89 + 13
-	nano := time.Now().UnixNano()
-	var nanostr string = strconv.FormatInt(nano, 10)
-	var temp3 string = nanostr[11:]
-	var temp4 string = "6"
-	var temp5 int = rand.Intn(9)*7 + 17
-	var code string = "66" + strconv.Itoa(temp1) + temp4 + strconv.Itoa(temp2) + temp3 + strconv.Itoa(temp5)
-	return code
-}
-
 // CustomerCourse 客户课程信息
 type CustomerCourse struct {
 	model.TaCustomerCourse `xorm:"extends"`

models/luckdraw/luckdraw.go

@@ -30,6 +30,10 @@ type LuckDraw struct {
 	model.TaLuckdraw `xorm:"extends"`
 	Prizes           []model.TaLuckdrawPrize
 }
+type LuckInfo struct {
+	model.TaLuckdrawRecord `xorm:"extends"`
+	CustomerQrcode         string
+}
 
 // GetLuckDraw 获取抽奖信息
 func (m *LuckDrawDao) GetLuckDraw(id string) (*LuckDraw, error) {
@@ -321,7 +325,7 @@ func (m *LuckDrawDao) UpdatePrizeDetail(detail model.TaPrizeDetail) error {
 }
 
 // UpdateRecord 核销更新抽奖记录表
-func (m *LuckDrawDao) UpdateRecord(record *model.TaLuckdrawRecord) error {
+func (m *LuckDrawDao) UpdateRecord(record *LuckInfo) error {
 	record.Status = models.STATUS_NORMAL
 	record.WriteoffDate = time.Now()
 	cols := []string{
@@ -396,10 +400,17 @@ func (m *LuckDrawDao) GetRecordByLuckDraw(luckdrawid string) ([]model.TaLuckdraw
 }
 
 // GetRecordByID 获取抽奖记录明细
-func (m *LuckDrawDao) GetRecordByID(id string) (*model.TaLuckdrawRecord, error) {
-	var record model.TaLuckdrawRecord
-	_, err := m.db.Where("id=?", id).Get(&record)
-	return &record, err
+func (m *LuckDrawDao) GetRecordByID(id string) (*LuckInfo, error) {
+	var record []LuckInfo
+	sql := `SELECT
+	a.*,
+	b.customer_qrcode 
+FROM
+	ta_luckdraw_record a
+	LEFT JOIN ta_customer_course_qrcode b ON a.id = b.customer_course_id
+	where a.id = '` + id + `'`
+	err := m.db.Sql(sql).Find(record)
+	return &record[0], err
 }
 
 // SaveLuckDrawShareData 保存用户分享信息

service/card/card.go

@@ -590,7 +590,7 @@ func (s *CardServ) SaveCustomerCourseByCard(customerCard *model.TaCustomerCard)
 			CustomerCourseId: customerCourseId,
 			QrcodeType:       models.QRCODE_TYPE_COURSE,
 			CreateDate:       time.Now(),
-			CustomerQrcode:   s.courseDao.GenerateQRCode(),
+			CustomerQrcode:   utils.GenerateQRCode(),
 			Status:           models.STATUS_NORMAL,
 		}
 		err = s.courseDao.SaveCustomerCourseQrcode(&custQrcode)

service/course/order.go

@@ -378,7 +378,7 @@ func (s *CourseServ) SaveOrder(order *model.TaCourseOrders, course *course.Cours
 	}
 	custQRCode := model.TaCustomerCourseQrcode{
 		CustomerCourseId: customerCourseId,
-		CustomerQrcode:   s.dao.GenerateQRCode(),
+		CustomerQrcode:   utils.GenerateQRCode(),
 		CreateDate:       time.Now(),
 		Status:           models.STATUS_NORMAL,
 		QrcodeType:       models.QRCODE_TYPE_COURSE,

service/customer/customer.go

@@ -244,15 +244,15 @@ func (s *CustomerServ) BindWechatCust(userMap *model.TaUserMapping, phone, caseI
 		}
 	}
 
+	// triggerRegiteEvent 触发注册事件
+	evtEngID := utils.EngineIDBy(cust.OrgId, cust.RecommendCase)
+	utils.EventEngineBus(evtEngID).EmitEvent(events.EvtRegiste, *cust)
+
 	// 如果客户ID 与映射表中一致, 说明已经绑定过了
 	if cust.CustomerId == userMap.UserId {
 		return cust, nil
 	}
 
-	// triggerRegiteEvent 触发注册事件
-	evtEngID := utils.EngineIDBy(cust.OrgId, cust.RecommendCase)
-	utils.EventEngineBus(evtEngID).EmitEvent(events.EvtRegiste, *cust)
-
 	// 更新用户映射信息
 	userMap.UserId = cust.CustomerId
 	if err := s.dao.UpdateUserMapping(userMap, []string{"user_id"}); err != nil {

service/events/giveCoupon.go

@@ -14,6 +14,8 @@ import (
 // giveCoupon 赠送卡券
 // Event.Payload.customer  = model.TaCustomer
 var giveCoupon = func(e tinyevent.Event) error {
+	utils.LogInfo("开始卡券赠送操作...")
+
 	hasDBError := false
 	ctx := NewContext()
 	defer DestroyContext(ctx, hasDBError)
@@ -29,6 +31,8 @@ var giveCoupon = func(e tinyevent.Event) error {
 	caseID := cust.RecommendCase
 	orgID := cust.OrgId
 
+	utils.LogInfo("被赠送人: " + cust.CustomerId)
+
 	query := `
 		SELECT
 			t.*
@@ -39,7 +43,7 @@ var giveCoupon = func(e tinyevent.Event) error {
 			s.org_id = ?
 		AND s.case_id = ?
 		AND s.status = ?
-		AND s.active_type = ?
+		AND s.activity_type = ?
 	`
 
 	var acts []model.SysActivityAction

service/luckdraw/luckdraw.go

@@ -2,22 +2,27 @@ package luckdraw
 
 import (
 	"errors"
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/course"
 	"spaceofcheng/services/models/luckdraw"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"time"
 )
 
 // LuckdrawServ 系统处理
 type LuckdrawServ struct {
-	ctx *utils.Context
-	dao *luckdraw.LuckDrawDao
+	ctx       *utils.Context
+	dao       *luckdraw.LuckDrawDao
+	courseDAO *course.CourseDAO
 }
 
 // NewLuckdrawServ 初始化
 func NewLuckdrawServ(ctx *utils.Context) *LuckdrawServ {
 	return &LuckdrawServ{
-		ctx: ctx,
-		dao: luckdraw.NewDAO(ctx),
+		ctx:       ctx,
+		dao:       luckdraw.NewDAO(ctx),
+		courseDAO: course.NewCourseDAO(ctx),
 	}
 }
 
@@ -123,8 +128,21 @@ func (s *LuckdrawServ) SaveRecord(record model.TaLuckdrawRecord) (*model.TaLuckd
 		utils.LogError("保存抽奖记录失败: " + err.Error())
 		return nil, errors.New("保存抽奖记录失败")
 	}
-	return newRecord, nil
 
+	custQRCode := model.TaCustomerCourseQrcode{
+		CustomerCourseId: newRecord.Id,
+		CustomerQrcode:   utils.GenerateQRCode(),
+		CreateDate:       time.Now(),
+		Status:           models.STATUS_NORMAL,
+		QrcodeType:       models.QRCODE_TYPE_PRIZE,
+	}
+
+	if err := s.courseDAO.SaveCustomerCourseQrcode(&custQRCode); err != nil {
+		utils.LogError("插入中奖二维码失败: " + err.Error())
+		return nil, errors.New("写入中奖二维码失败")
+	}
+
+	return newRecord, nil
 }
 
 func (s *LuckdrawServ) GetPrizeDetail(prizeid string) ([]model.TaPrizeDetail, error) {
@@ -145,7 +163,7 @@ func (s *LuckdrawServ) UpdatePrizeDetail(detail model.TaPrizeDetail) error {
 	return nil
 }
 
-func (s *LuckdrawServ) UpdateRecord(record *model.TaLuckdrawRecord) error {
+func (s *LuckdrawServ) UpdateRecord(record *luckdraw.LuckInfo) error {
 	err := s.dao.UpdateRecord(record)
 	if err != nil {
 		utils.LogError("核销更新抽奖记录表失败: " + err.Error())
@@ -209,7 +227,7 @@ func (s *LuckdrawServ) GetRecordByLuckDraw(luckdrawid string) ([]model.TaLuckdra
 	return record, nil
 }
 
-func (s *LuckdrawServ) GetRecordByID(id string) (*model.TaLuckdrawRecord, error) {
+func (s *LuckdrawServ) GetRecordByID(id string) (*luckdraw.LuckInfo, error) {
 	record, err := s.dao.GetRecordByID(id)
 	if err != nil {
 		utils.LogError("获取抽奖记录明细失败: " + err.Error())

service/luckdrawlist/luckdrawlist.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"spaceofcheng/services/models/luckdrawlist"
 	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/models/verify"
 	"spaceofcheng/services/utils"
 	"strings"
 
@@ -12,15 +13,17 @@ import (
 
 // LuckdrawlistServ 系统处理
 type LuckdrawlistServ struct {
-	ctx *utils.Context
-	dao *luckdrawlist.LuckdrawDAO
+	ctx       *utils.Context
+	dao       *luckdrawlist.LuckdrawDAO
+	verifyDao *verify.VerifyDAO
 }
 
 // NewLuckdrawlistServ 初始化
 func NewLuckdrawlistServ(ctx *utils.Context) *LuckdrawlistServ {
 	return &LuckdrawlistServ{
-		ctx: ctx,
-		dao: luckdrawlist.NewLuckdrawDAO(ctx),
+		ctx:       ctx,
+		dao:       luckdrawlist.NewLuckdrawDAO(ctx),
+		verifyDao: verify.NewVerifyDAO(ctx),
 	}
 }
 func (s *LuckdrawlistServ) GetLuckShareList(caseID, fromPhone, toPhone string, pagenavi ...int) ([]model.TaShareLuckyRecord, int64, error) {
@@ -95,7 +98,12 @@ func (s *LuckdrawlistServ) GetLuckdrawList(caseID string, pagenavi ...int) ([]lu
 
 }
 
-func (s *LuckdrawlistServ) GetVerifyList(luckdrawId, caseIDs string) (*luckdrawlist.Luckdraw, error) {
+func (s *LuckdrawlistServ) GetVerifyList(qrcode, caseIDs string) (*luckdrawlist.Luckdraw, error) {
+	luckdrawId, err := s.verifyDao.GetCustomerCourseIdByQrcode(qrcode)
+	if err != nil {
+		utils.LogError("查询抽奖列表失败: " + err.Error())
+		return nil, errors.New("查询抽奖列表失败")
+	}
 	luckdraw, err := s.dao.GetLuckdrawById(luckdrawId, caseIDs)
 	if err != nil {
 		utils.LogError("查询抽奖列表失败: " + err.Error())

utils/event.go

@@ -53,6 +53,8 @@ func ResetEventEngineBus(id string) *EventEngine {
 
 // EmitEvent 执行事件
 func (t EventEngine) EmitEvent(evt string, payload interface{}) {
+	LogInfo("触发事件: "+evt, payload)
+
 	e := tinyevent.Event{
 		Name:    evt,
 		Payload: payload,

utils/log.go

@@ -75,6 +75,23 @@ func LogError(v ...interface{}) error {
 	return nil
 }
 
+// LogInfo Info 日志
+func LogInfo(v ...interface{}) {
+	log := instances["common"]
+
+	if len(v) > 0 {
+		firstV := v[0]
+		leftV := v[1:]
+
+		switch msg := firstV.(type) {
+		case string:
+			log.Info(msg, leftV...)
+		default:
+			log.Info("Unknown message type", leftV...)
+		}
+	}
+}
+
 // GetDefaultLogger 获取默认 logger
 func GetDefaultLogger() *logs.BeeLogger {
 	log := instances["common"]

utils/utils.go

@@ -2,9 +2,11 @@ package utils
 
 import (
 	"encoding/base64"
+	"math/rand"
 	"net/http"
 	"strconv"
 	"strings"
+	"time"
 )
 
 // 客户端类型
@@ -126,3 +128,16 @@ func GetPageNaviLimit(params ...int) []int {
 		(page - 1) * pagesize,
 	}
 }
+
+// GenerateQRCode 生成二维码数字
+func GenerateQRCode() string {
+	var temp1 int = rand.Intn(9)*87 + 11
+	var temp2 int = rand.Intn(9)*89 + 13
+	nano := time.Now().UnixNano()
+	var nanostr string = strconv.FormatInt(nano, 10)
+	var temp3 string = nanostr[11:]
+	var temp4 string = "6"
+	var temp5 int = rand.Intn(9)*7 + 17
+	var code string = "66" + strconv.Itoa(temp1) + temp4 + strconv.Itoa(temp2) + temp3 + strconv.Itoa(temp5)
+	return code
+}