feats

conf/log.conf

@@ -1,4 +1,4 @@
 [common]
-filename="E:\\GoProject\\src\\spaceofcheng\\services\\log\\common.log"
+filename="E:\\GoProjects\\src\\spaceofcheng\\services\\log\\common.log"
 # log level "emergency", "alert", "critical", "error", "warning", "notice", "info", "debug"
 level="debug"

controllers/coupon/coupon.go

@@ -0,0 +1,169 @@
+package coupon
+
+import (
+	"encoding/json"
+	"errors"
+	"net/http"
+	"spaceofcheng/services/controllers"
+	cpModel "spaceofcheng/services/models/coupon"
+	"spaceofcheng/services/service/coupon"
+	"spaceofcheng/services/utils"
+	"strings"
+)
+
+// CouponController 商品
+type CouponController struct {
+	serv *coupon.CouponServ
+	controllers.BaseController
+}
+
+// Constructor 初始化 Controller
+// @Title Constructor
+// @Description 初始化 Controller, 系统自动调用
+func (c *CouponController) Constructor() {
+	c.serv = coupon.NewCouponServ(c.Context)
+}
+
+// ListByCase 获取券列表
+func (c *CouponController) ListByCase() {
+	caseID := c.GetString("caseid")
+
+	page, _ := c.GetInt("page")
+	pagesize, _ := c.GetInt("pagesize")
+	if page < 0 {
+		page = 1
+	}
+
+	if pagesize <= 0 {
+		pagesize = 10
+	}
+
+	list, total, err := c.serv.GetCouponList(caseID, page, pagesize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(map[string]interface{}{
+		"list":     list,
+		"page":     page,
+		"pagesize": pagesize,
+		"pagenum":  total,
+	})
+}
+
+// GetCouponByIDForAdmin 获取优惠券
+// 管理端
+func (c *CouponController) GetCouponByIDForAdmin() {
+	id := c.GetString(":id")
+	if id == "" {
+		c.ResponseError(errors.New("未指定券"))
+	}
+
+	cp, err := c.serv.GetCouponByIDWithCheck(id)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(map[string]interface{}{
+		"coupon": cp,
+	})
+}
+
+// GetCouponByID 获取优惠券
+// 微信端
+func (c *CouponController) GetCouponByID() {
+	id := c.GetString(":id")
+	if id == "" {
+		c.ResponseError(errors.New("未指定券"))
+	}
+
+	cp, err := c.serv.GetCouponByID(id)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(map[string]interface{}{
+		"coupon": cp,
+	})
+}
+
+// SaveCoupon 保存优惠券
+func (c *CouponController) SaveCoupon() {
+	jsnStr := c.GetString("info")
+	if jsnStr == "" {
+		c.ResponseError(errors.New("未接收到保存内容"))
+	}
+
+	cp := cpModel.CouponInfo{}
+
+	if err := json.Unmarshal([]byte(jsnStr), &cp); err != nil {
+		utils.LogError("接收优惠券信息失败: " + err.Error())
+		c.ResponseError(errors.New("接收参数失败"), http.StatusInternalServerError)
+	}
+
+	// TODO
+	// 校验各字段不能为空
+
+	// 入库
+	cp.CouponId = ""
+	if err := c.serv.SaveCoupon(&cp); err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(map[string]interface{}{
+		"coupon": cp,
+	})
+}
+
+// UpdateCoupon 更新优惠券
+func (c *CouponController) UpdateCoupon() {
+	jsnStr := c.GetString("info")
+	if jsnStr == "" {
+		c.ResponseError(errors.New("未接收到更新内容"))
+	}
+
+	id := c.GetString(":id")
+	if id == "" {
+		c.ResponseError(errors.New("未指定券"))
+	}
+
+	cp := cpModel.CouponInfo{}
+
+	if err := json.Unmarshal([]byte(jsnStr), &cp); err != nil {
+		utils.LogError("接收优惠券信息失败: " + err.Error())
+		c.ResponseError(errors.New("接收参数失败"), http.StatusInternalServerError)
+	}
+
+	// TODO
+	// 校验各字段不能为空
+
+	// 入库
+	cp.CouponId = id
+	if err := c.serv.UpdateCoupon(&cp); err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(map[string]interface{}{
+		"coupon": cp,
+	})
+}
+
+// GiveCoupon 赠送优惠券
+func (c *CouponController) GiveCoupon() {
+	id := c.GetString(":id")
+	if id == "" {
+		c.ResponseError(errors.New("未指定券"))
+	}
+
+	uids := c.GetString(":users")
+	if uids == "" {
+		c.ResponseError(errors.New("未指定赠送人"))
+	}
+
+	err := c.serv.GiveCoupon(id, strings.Split(uids, ","))
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON("ok")
+}

models/constant.go

@@ -124,3 +124,10 @@ const (
 	GYM_CARD_QUARTER = "quarter"
 	GYM_CARD_YEAR    = "year"
 )
+
+// 系统资源
+// 可用于卡券关联内容选择
+const (
+	SYS_RESOURCE_COURSE = "course"
+	SYS_RESOURCE_GOODS  = "goods"
+)

models/coupon/coupon.go

@@ -96,6 +96,7 @@ func (m *CouponDAO) GetCouponList(filters []string, limit []int) ([]model.TaCoup
 	filterString := ""
 	if len(filters) > 0 {
 		filterString = strings.Join(filters, " and ")
+		filterString += " and "
 	}
 
 	sql := `select * from ta_coupon where %s status = 1 order by create_date desc`

models/coupon/target.go

@@ -1,6 +1,7 @@
 package coupon
 
 import (
+	"errors"
 	"spaceofcheng/services/models/model"
 )
 
@@ -11,6 +12,13 @@ func (m *CouponDAO) UpdateTarget(targets []model.TaCouponTarget, couponID string
 	}
 
 	for i := range targets {
+		if targets[i].TargetId == "" {
+			return errors.New("关联内容不能为空")
+		}
+
+		// TODO
+		// 校验关联内容是否有效
+
 		targets[i].CouponId = couponID
 	}
 

models/model/ta_coupon.go

@@ -8,7 +8,7 @@ type TaCoupon struct {
 	CouponId     string    `xorm:"not null pk VARCHAR(64)"`
 	CouponName   string    `xorm:"VARCHAR(255)"`
 	CouponTypeId string    `xorm:"VARCHAR(64)"`
-	SendType     int       `xorm:"comment('0案场 1渠道') SMALLINT(6)"`
+	SendType     string    `xorm:"VARCHAR(20)"`
 	VideoUrl     string    `xorm:"TEXT"`
 	CoverUrl     string    `xorm:"TEXT"`
 	Price        string    `xorm:"DECIMAL(64)"`

models/model/ta_coupon_target.go

@@ -1,6 +1,7 @@
 package model
 
 type TaCouponTarget struct {
+	TargetType string `xorm:"not null pk VARCHAR(20)"`
 	TargetId   string `xorm:"not null pk VARCHAR(64)"`
 	CouponId   string `xorm:"VARCHAR(64)"`
 	TargetName string `xorm:"VARCHAR(255)"`

routers/common.go

@@ -4,6 +4,7 @@ import (
 	"spaceofcheng/services/controllers"
 	"spaceofcheng/services/controllers/cases"
 	"spaceofcheng/services/controllers/channel"
+	"spaceofcheng/services/controllers/coupon"
 	"spaceofcheng/services/controllers/course"
 	"spaceofcheng/services/controllers/customer"
 	"spaceofcheng/services/controllers/goods"
@@ -214,6 +215,12 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/order/goods/finish/:id", &goods.GoodsController{}, "put:FinishMake"),
 		beego.NSRouter("/order/goods/cancel/:id", &goods.GoodsController{}, "put:CancelMake"),
 
+		// 优惠券
+		beego.NSRouter("/coupon", &coupon.CouponController{}, "get:ListByCase"),
+		beego.NSRouter("/coupon", &coupon.CouponController{}, "post:SaveCoupon"),
+		beego.NSRouter("/coupon/:id", &coupon.CouponController{}, "put:UpdateCoupon"),
+		beego.NSRouter("/coupon/:id/to/:users", &coupon.CouponController{}, "post:GiveCoupon"),
+
 		// 文件
 		beego.NSRouter("/file", &controllers.BaseController{}, "post:FileUpload"),
 

service/coupon/coupon.go

@@ -7,6 +7,7 @@ import (
 	"spaceofcheng/services/models/customer"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strings"
 	"time"
 
 	"github.com/yl10/kit/guid"
@@ -30,19 +31,34 @@ func NewCouponServ(ctx *utils.Context) *CouponServ {
 
 // GetCouponList 获取优惠券列表
 func (s *CouponServ) GetCouponList(caseID string, pagenavi ...int) ([]model.TaCoupon, int64, error) {
-	if caseID == "" {
-		return nil, 0, errors.New("未指定案场")
-	}
+	filters := []string{}
 
-	if err := utils.NewAuthEngine(s.ctx).CheckCase(caseID); err != nil {
-		return nil, 0, err
-	}
+	if caseID != "" {
+		if err := utils.NewAuthEngine(s.ctx).CheckCase(caseID); err != nil {
+			return nil, 0, err
+		}
 
-	limit := utils.GetPageNaviLimit(pagenavi...)
-	filters := []string{
-		"case_id='" + caseID + "'",
+		filters = []string{
+			"case_id='" + caseID + "'",
+		}
+	} else {
+		casesRaw := s.ctx.Get("cases")
+		if casesRaw == nil {
+			return nil, 0, errors.New("请设置过滤案场")
+		}
+
+		cases := casesRaw.([]model.SysUserCase)
+		caseIDs := []string{}
+		for _, cs := range cases {
+			caseIDs = append(caseIDs, cs.CaseId)
+		}
+
+		filters = []string{
+			"case_id in ('" + strings.Join(caseIDs, "','") + "')",
+		}
 	}
 
+	limit := utils.GetPageNaviLimit(pagenavi...)
 	res, total, err := s.dao.GetCouponList(filters, limit)
 	if err != nil {
 		utils.LogError("查询优惠券列表失败: " + err.Error())
@@ -176,17 +192,6 @@ func (s *CouponServ) GiveCoupon(couponID string, uids []string) error {
 		}
 	}
 
-	// 计算卡券有效期
-	startDate := cp.StartDate
-	endDate := cp.EndDate
-	if cp.ValidDays > 0 {
-		startDate = now
-		hs := int64(cp.ValidDays * 24)
-		endDate = now.Add(time.Hour * time.Duration(hs))
-	}
-
-	cps := make([]model.TaCustomerCoupon, 0)
-	recs := make([]model.TaCouponGiveRecord, 0)
 	for _, uid := range uids {
 		// 获取客户信息
 		cust, err := s.custDao.GetCustomerByID(uid)
@@ -195,56 +200,121 @@ func (s *CouponServ) GiveCoupon(couponID string, uids []string) error {
 			return errors.New("校验客户信息失败")
 		}
 
-		// 检查用户是否已经有了该券
-		custCPS, err := s.dao.CheckCustCoupon(uid, cp.CouponId, startDate, endDate)
-		if err != nil {
-			utils.LogError("校验客户优惠券失败: " + err.Error())
-			return errors.New("校验客户优惠券失败")
+		if err := s.GiveCouponTo(&user, cust, cp); err != nil {
+			return err
 		}
+	}
 
-		if custCPS != nil && len(custCPS) > 0 {
-			return errors.New("客户 " + cust.CustomerName + " 已经拥有该券")
-		}
+	return nil
+}
 
-		// 放入我的卡券
-		custCP := model.TaCustomerCoupon{
-			CouponId:           cp.CouponId,
-			CustomerCouponName: cp.CouponName,
-			CustomerId:         uid,
-			StartDate:          startDate,
-			EndDate:            endDate,
-			ReceiveDate:        now,
-			CaseId:             cp.CaseId,
-			OrgId:              cp.OrgId,
-		}
+// GiveCouponTo 赠送优惠券
+// 本方法会被多出调用, 方法内使用 Context 将是不安全的
+func (s *CouponServ) GiveCouponTo(from *model.SysUser, to *model.TaCustomer, cp *model.TaCoupon) error {
+	if from.UserId == "" {
+		return errors.New("必须指定赠送人")
+	}
+
+	if to.CustomerId == "" {
+		return errors.New("必须指定接收人")
+	}
 
-		cps = append(cps, custCP)
-
-		// 放入赠送记录
-		rec := model.TaCouponGiveRecord{
-			GiftType:   models.GIVE_GIFT_COUPON,
-			GiftId:     cp.CouponId,
-			GiftName:   cp.CouponName,
-			FromId:     user.UserId,
-			FromName:   user.UserName,
-			ToId:       cust.CustomerId,
-			ToName:     cust.CustomerName,
-			CreateDate: now,
+	// 优惠券必须状态正常
+	if cp.CouponId == "" || cp.Status != models.STATUS_NORMAL {
+		return errors.New("优惠券已失效或者不存在")
+	}
+
+	now := time.Now().Local()
+	if cp.ValidDays <= 0 {
+		if cp.EndDate.Before(now) {
+			return errors.New("优惠券已失效")
 		}
+	}
+
+	// 计算卡券有效期
+	startDate := cp.StartDate
+	endDate := cp.EndDate
+	if cp.ValidDays > 0 {
+		startDate = now
+		hs := int64(cp.ValidDays * 24)
+		endDate = now.Add(time.Hour * time.Duration(hs))
+	}
 
-		recs = append(recs, rec)
+	// 检查用户是否已经有了该券
+	custCPS, err := s.dao.CheckCustCoupon(to.CustomerId, cp.CouponId, startDate, endDate)
+	if err != nil {
+		utils.LogError("校验客户优惠券失败: " + err.Error())
+		return errors.New("校验客户优惠券失败")
+	}
+
+	if custCPS != nil && len(custCPS) > 0 {
+		return errors.New("客户 " + to.CustomerName + " 已经拥有该券")
+	}
+
+	// 放入我的卡券
+	custCP := model.TaCustomerCoupon{
+		CouponId:           cp.CouponId,
+		CustomerCouponName: cp.CouponName,
+		CustomerId:         to.CustomerId,
+		StartDate:          startDate,
+		EndDate:            endDate,
+		ReceiveDate:        now,
+		CaseId:             cp.CaseId,
+		OrgId:              cp.OrgId,
+	}
+
+	// 放入赠送记录
+	rec := model.TaCouponGiveRecord{
+		GiftType:   models.GIVE_GIFT_COUPON,
+		GiftId:     cp.CouponId,
+		GiftName:   cp.CouponName,
+		FromId:     from.UserId,
+		FromName:   from.UserName,
+		ToId:       to.CustomerId,
+		ToName:     to.CustomerName,
+		CreateDate: now,
 	}
 
 	// 入库
-	if err := s.dao.SaveCustomerCoupons(cps); err != nil {
+	if err := s.dao.SaveCustomerCoupons([]model.TaCustomerCoupon{custCP}); err != nil {
 		utils.LogError("保存客户优惠券失败: " + err.Error())
 		return errors.New("保存客户优惠券失败")
 	}
 
-	if err := s.dao.SaveCouponRecoreds(recs); err != nil {
+	if err := s.dao.SaveCouponRecoreds([]model.TaCouponGiveRecord{rec}); err != nil {
 		utils.LogError("保存优惠券赠送记录失败: " + err.Error())
 		return errors.New("保存优惠券赠送记录失败")
 	}
 
+	// TODO
+	// 券库存处理
+
 	return nil
 }
+
+// GetCouponByID 获取优惠券
+// 未进行权限校验, 非安全的
+func (s *CouponServ) GetCouponByID(cpID string) (*model.TaCoupon, error) {
+	cp, err := s.dao.GetCouponByID(cpID)
+	if err != nil {
+		utils.LogError("获取优惠券失败: " + err.Error())
+		return nil, errors.New("校验优惠券失败")
+	}
+
+	return cp, nil
+}
+
+// GetCouponByIDWithCheck 获取优惠券
+func (s *CouponServ) GetCouponByIDWithCheck(cpID string) (*model.TaCoupon, error) {
+	cp, err := s.dao.GetCouponByID(cpID)
+	if err != nil {
+		utils.LogError("获取优惠券失败: " + err.Error())
+		return nil, errors.New("校验优惠券失败")
+	}
+
+	if err := utils.NewAuthEngine(s.ctx).CheckCase(cp.CaseId); err != nil {
+		return nil, err
+	}
+
+	return cp, nil
+}

service/customer/customer.go

@@ -140,7 +140,8 @@ func (s *CustomerServ) BindWechatUser(userMap *model.TaUserMapping, phone string
 	}
 
 	// triggerRegiteEvent 触发注册事件
-	utils.EmitEvent(events.EvtRegiste, *cust)
+	evtEngID := utils.EngineIDBy(cust.OrgId, cust.RecommendCase)
+	utils.EventEngineBus(evtEngID).EmitEvent(events.EvtRegiste, *cust)
 
 	// if cust.CustomerId == userMap.UserId {
 	// 	return cust, nil
@@ -243,7 +244,8 @@ func (s *CustomerServ) BindWechatCust(userMap *model.TaUserMapping, phone, caseI
 	}
 
 	// triggerRegiteEvent 触发注册事件
-	utils.EmitEvent(events.EvtRegiste, *cust)
+	evtEngID := utils.EngineIDBy(cust.OrgId, cust.RecommendCase)
+	utils.EventEngineBus(evtEngID).EmitEvent(events.EvtRegiste, *cust)
 
 	// 更新用户映射信息
 	userMap.UserId = cust.CustomerId

service/events/events.go

@@ -2,6 +2,9 @@ package events
 
 import (
 	"fmt"
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
 	"sync"
 
 	"github.com/zjxpcyc/tinyevent"
@@ -19,45 +22,61 @@ var EvtActions = map[string]tinyevent.Action{
 }
 
 // ListenAllEvent 监听所有事件
-func ListenAllEvent() {
+func ListenAllEvent(orgID, caseID string) {
 	mtx.Lock()
 	defer mtx.Unlock()
 
-	// // 所有需要执行的事件
-	// allEvts, err := getAllEvents()
-	// if err != nil {
-	// 	utils.LogError(err)
-	// }
-
-	// // 刷新中控中心
-	// utils.ResetEvtBus()
-
-	// for evt, acts := range allEvts {
-	// 	for _, actKey := range acts {
-	// 		act, ok := EvtActions[actKey]
-	// 		if ok {
-	// 			utils.ListenEvent(evt, act)
-	// 		}
-	// 	}
-	// }
+	evtEngID := utils.EngineIDBy(orgID, caseID)
+	evtEngine := utils.ResetEventEngineBus(evtEngID)
+
+	// 所有需要执行的事件
+	allEvts, err := getAllEvents(orgID, caseID)
+	if err != nil {
+		utils.LogError(err)
+	}
+
+	// 刷新中控中心
+	for evt, acts := range allEvts {
+		for _, actKey := range acts {
+			act, ok := EvtActions[actKey]
+			if ok {
+				evtEngine.ListenEvent(evt, act)
+			}
+		}
+	}
 }
 
 // getAllEvents 获取数据库配置
-func getAllEvents() (map[string][]string, error) {
-	// db := models.DBEngine
-
-	// var evts []model.SysActivity
-	// if err := db.Where("status=?", models.STATUS_NORMAL).Find(&evts); err != nil {
-	// 	return nil, err
-	// }
-
-	// TODO
-	return map[string][]string{
-		EvtRegiste: []string{
-			ActTest,
-			ActGiveCoupon,
-		},
-	}, nil
+func getAllEvents(orgID, caseID string) (map[string][]string, error) {
+	db := models.DBEngine
+
+	var evts []model.SysActivity
+	var acts []model.SysActivityAction
+
+	if err := db.Where("org_id=?", orgID).
+		And("case_id=?", caseID).
+		And("status=?", models.STATUS_NORMAL).
+		Find(&evts); err != nil {
+		utils.LogError("查询营销活动配置表失败: " + err.Error())
+		return nil, err
+	}
+
+	res := make(map[string][]string)
+	for _, evtSetting := range evts {
+		res[evtSetting.ActivityType] = make([]string, 0)
+		acts = make([]model.SysActivityAction, 0)
+
+		if err := db.Where("activity_id=?", evtSetting.ActivityId).Find(&acts); err != nil {
+			utils.LogError("查询营销活动配置明细失败: " + err.Error())
+			return nil, err
+		}
+
+		for _, act := range acts {
+			res[evtSetting.ActivityType] = append(res[evtSetting.ActivityType], act.ActiveType)
+		}
+	}
+
+	return res, nil
 }
 
 var tsAction = func(e tinyevent.Event) error {

service/events/giveCoupon.go

@@ -1,22 +1,80 @@
 package events
 
 import (
+	"errors"
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service/coupon"
+	"spaceofcheng/services/utils"
+
 	"github.com/zjxpcyc/tinyevent"
 )
 
 // giveCoupon 赠送卡券
 // Event.Payload.customer  = model.TaCustomer
-// Event.Payload.caseId  = 案场ID
 var giveCoupon = func(e tinyevent.Event) error {
-	// db := models.DBEngine
+	hasDBError := false
+	ctx := NewContext()
+	defer DestroyContext(ctx, hasDBError)
+
+	if e.Payload == nil {
+		hasDBError = true
+		utils.LogError("注册送券失败, 没有用户信息")
+		return errors.New("注册送券失败, 没有用户信息")
+	}
+	dtRaw := e.Payload.(map[string]interface{})
+
+	cust := dtRaw["customer"].(model.TaCustomer)
+	caseID := cust.RecommendCase
+	orgID := cust.OrgId
+
+	query := `
+		SELECT
+			t.*
+		FROM
+			sys_activity_action t
+		JOIN sys_activity s ON t.activity_id = s.activity_id
+		WHERE
+			s.org_id = ?
+		AND s.case_id = ?
+		AND s.status = ?
+		AND t.active_type = ?
+	`
+
+	var gifts []model.SysActivityAction
+	if err := models.DBEngine.SQL(query, orgID, caseID, models.STATUS_NORMAL, e.Name).Find(&gifts); err != nil {
+		hasDBError = true
+		utils.LogError("检查营销活动失败: " + err.Error())
+		return errors.New("检查营销活动失败")
+	}
+
+	fromUser := model.SysUser{
+		UserId:   "SYSTEM",
+		UserName: "system",
+	}
+
+	cpServ := coupon.NewCouponServ(ctx)
 
-	// if e.Payload == nil {
-	// 	utils.LogError("注册送券失败, 没有用户信息")
-	// }
-	// dtRaw := e.Payload.(map[string]interface{})
+	for _, gift := range gifts {
+		switch gift.ResourceType {
+		case models.GIVE_GIFT_COUPON:
+			cpID := gift.ResourceDesc
+			cp, err := cpServ.GetCouponByID(cpID)
+			if err != nil {
+				utils.LogError("获取优惠券失败: " + err.Error())
+				hasDBError = true
+				return errors.New("校验优惠券失败")
+			}
 
-	// cust := dtRaw["customer"].(model.TaCustomer)
-	// caseID := dtRaw["caseId"].(string)
+			if err := cpServ.GiveCouponTo(&fromUser, &cust, cp); err != nil {
+				hasDBError = true
+				return err
+			}
+		case models.GIVE_GIFT_EXPERIENCECARD:
+		case models.GIVE_GIFT_GYM:
+		default:
+		}
+	}
 
 	return nil
 }

service/events/utils.go

@@ -0,0 +1,25 @@
+package events
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/utils"
+)
+
+// NewContext 初始化 ctx 实例
+func NewContext() *utils.Context {
+	ctx := utils.NewContext(models.DBEngine, nil)
+	ctx.Ready()
+
+	return ctx
+}
+
+// DestroyContext 注销 ctx
+func DestroyContext(ctx *utils.Context, hasError bool) {
+	if !hasError {
+		ctx.DB.Commit()
+	} else {
+		ctx.DB.Rollback()
+	}
+
+	ctx.Destroy()
+}

service/sys.go

@@ -75,7 +75,7 @@ func (s *SysServ) SetCustomer(id string) error {
 func (s *SysServ) SaveNewCustomer(wxInfo map[string]interface{}, userMap *model.TaUserMapping) (*model.TaCustomer, error) {
 	// 微信相关字段
 	nickyName := wxInfo["nickname"].(string)
-	sex := wxInfo["sex"].(int)
+	sex := wxInfo["sex"].(float64)
 	headimgurl := wxInfo["headimgurl"].(string)
 
 	org := s.ctx.Get("org").(model.SysOrg)
@@ -83,7 +83,7 @@ func (s *SysServ) SaveNewCustomer(wxInfo map[string]interface{}, userMap *model.
 	cust := model.TaCustomer{
 		CustomerName: nickyName,
 		Name:         nickyName,
-		Sex:          sex,
+		Sex:          int(sex),
 		Headimgurl:   headimgurl,
 		OrgId:        org.OrgId,
 	}

utils/event.go

@@ -1,49 +1,73 @@
 package utils
 
-// type EventEngine struct {
-// 	ID     string
-// 	engine *tinyevent.DefaultBus
-// }
+import "github.com/zjxpcyc/tinyevent"
 
-// var evtBus map[string]*EventEngine
+// EventEngine Event Engine
+type EventEngine struct {
+	ID     string
+	engine *tinyevent.DefaultBus
+}
 
-// func NewEventEngineBus(id string) *EventEngine {
-// 	if evtBus == nil {
-// 		evtBus = make(map[string]*EventEngine)
-// 	}
+var evtBus map[string]*EventEngine
 
-// 	if id == "" {
-// 		return nil
-// 	}
+// EventEngineBus 初始化实例
+func EventEngineBus(id string) *EventEngine {
+	if evtBus == nil {
+		evtBus = make(map[string]*EventEngine)
+	}
 
-// 	evtEngine := &EventEngine{
-// 		ID:     id,
-// 		engine: new(tinyevent.DefaultBus),
-// 	}
+	if id == "" {
+		return nil
+	}
 
-// 	evtBus[id] = evtEngine
+	if evtBus[id] == nil {
+		evtEngine := &EventEngine{
+			ID:     id,
+			engine: new(tinyevent.DefaultBus),
+		}
 
-// 	return evtEngine
-// }
+		evtBus[id] = evtEngine
+	}
 
-// // EmitEvent 执行事件
-// func (t EventEngine) EmitEvent(evt string, payload interface{}) {
-// 	e := tinyevent.Event{
-// 		Name:    evt,
-// 		Payload: payload,
-// 	}
+	return evtBus[id]
+}
 
-// 	t.engine.Emit(e)
-// }
+// ResetEventEngineBus 重设事件管理引擎
+func ResetEventEngineBus(id string) *EventEngine {
+	if id == "" || evtBus[id] == nil {
+		return nil
+	}
 
-// // ListenEvent 注册监听
-// func (t EventEngine) ListenEvent(evt string, act tinyevent.Action) string {
-// 	return t.engine.On(evt, act)
-// }
+	evtEngine := &EventEngine{
+		ID:     id,
+		engine: new(tinyevent.DefaultBus),
+	}
 
-// // UnListenEvt 取消监听
-// func (t EventEngine) UnListenEvt(id string) {
-// 	t.engine.Off(id)
-// }
+	evtBus[id] = evtEngine
+	return evtEngine
+}
 
-func EmitEvent(evt string, payload interface{}) {}
+// EmitEvent 执行事件
+func (t EventEngine) EmitEvent(evt string, payload interface{}) {
+	e := tinyevent.Event{
+		Name:    evt,
+		Payload: payload,
+	}
+
+	t.engine.Emit(e)
+}
+
+// ListenEvent 注册监听
+func (t EventEngine) ListenEvent(evt string, act tinyevent.Action) string {
+	return t.engine.On(evt, act)
+}
+
+// UnListenEvt 取消监听
+func (t EventEngine) UnListenEvt(id string) {
+	t.engine.Off(id)
+}
+
+// EngineIDBy 获取 Engine Id
+func EngineIDBy(orgID, caseID string) string {
+	return orgID + caseID
+}