bug fix

service/events/events.go

@@ -42,6 +42,7 @@ func ListenAllEvent(orgID, caseID string) {
 	for evt, acts := range allEvts {
 		for _, actKey := range acts {
 			act, ok := EvtActions[actKey]
+
 			if ok {
 				evtEngine.ListenEvent(evt, act)
 			}
@@ -66,7 +67,11 @@ func getAllEvents(orgID, caseID string) (map[string][]string, error) {
 
 	res := make(map[string][]string)
 	for _, evtSetting := range evts {
-		res[evtSetting.ActivityType] = make([]string, 0)
+		tpEvts, ok := res[evtSetting.ActivityType]
+		if !ok {
+			tpEvts = make([]string, 0)
+		}
+
 		acts = make([]model.SysActivityAction, 0)
 
 		if err := db.Where("activity_id=?", evtSetting.ActivityId).Find(&acts); err != nil {
@@ -75,8 +80,13 @@ func getAllEvents(orgID, caseID string) (map[string][]string, error) {
 		}
 
 		for _, act := range acts {
-			res[evtSetting.ActivityType] = append(res[evtSetting.ActivityType], act.ActiveType)
+			// 加入 tpEvts 需要去重
+			if utils.StrSliceIndexOf(tpEvts, act.ActiveType) == -1 {
+				tpEvts = append(tpEvts, act.ActiveType)
+			}
 		}
+
+		res[evtSetting.ActivityType] = tpEvts
 	}
 
 	return res, nil

service/events/giveCard.go

@@ -8,6 +8,8 @@ import (
 	"spaceofcheng/services/service/card"
 	"spaceofcheng/services/utils"
 
+	"github.com/astaxie/beego"
+
 	"github.com/zjxpcyc/tinyevent"
 )
 
@@ -18,13 +20,15 @@ var giveCard = func(e tinyevent.Event) error {
 	defer DestroyContext(ctx, false)
 
 	if e.Payload == nil {
-		utils.LogError("注册送券失败, 没有用户信息")
-		return errors.New("注册送券失败, 没有用户信息")
+		utils.LogError("注册送卡失败, 没有用户信息")
+		return errors.New("注册送卡失败, 没有用户信息")
 	}
 	cust := e.Payload.(model.TaCustomer)
 	caseID := cust.RecommendCase
 	orgID := cust.OrgId
 
+	beego.Info("---------->", caseID, cust)
+
 	utils.LogInfo("被赠送人: " + cust.CustomerId)
 	query := `
 		SELECT
@@ -60,6 +64,8 @@ var giveCard = func(e tinyevent.Event) error {
 				continue
 			}
 
+			beego.Info("---------->", res)
+
 			cpID, has := res["giftValue"]
 			if !has {
 				continue
@@ -67,12 +73,12 @@ var giveCard = func(e tinyevent.Event) error {
 
 			cp, err := cpServ.GetCardByID(cpID.(string))
 			if err != nil {
-				utils.LogError("获取优惠券失败: " + err.Error())
+				utils.LogError("获取体验卡失败: " + err.Error())
 				continue
 			}
 
 			if err := cpServ.GiveCardTo(&fromUser, &cust, cp); err != nil {
-				utils.LogError("送券失败: " + err.Error())
+				utils.LogError("送卡失败: " + err.Error())
 				continue
 			}
 		default:

service/events/giveCoupon.go

@@ -7,6 +7,7 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/coupon"
 	"spaceofcheng/services/utils"
+	"strings"
 
 	"github.com/zjxpcyc/tinyevent"
 )
@@ -61,7 +62,7 @@ var giveCoupon = func(e tinyevent.Event) error {
 		switch act.ActiveType {
 		case ActGiveCoupon:
 			res := make(map[string]interface{})
-			if err := json.Unmarshal([]byte(act.ResourceDesc), &res); err != nil {
+			if err := json.Unmarshal([]byte(strings.Replace(act.ResourceDesc, "\n", "\\n", -1)), &res); err != nil {
 				utils.LogError("解析优惠券赠送规则失败: " + err.Error())
 				continue
 			}

service/sys.go

@@ -182,7 +182,6 @@ func (s *SysServ) authWechat(gctx *context.Context) map[string]interface{} {
 
 		// 获取 token
 		token, err := s.getToken(gctx)
-		utils.LogError("token:", token)
 		if err != nil {
 			tokenStr := s.ctx.Get("token").(string)
 			if tokenStr != "" {