Jianghan 9 月之前
父節點
當前提交
9d38bbac6e
共有 2 個文件被更改,包括 12 次插入12 次删除
  1. 11 11
      handler/activity/newUserAward.go
  2. 1 1
      handler/activity/task.go

+ 11 - 11
handler/activity/newUserAward.go

@@ -46,17 +46,17 @@ func NewUserActivity(msg *model.Message) {
 		}
 		err = rpc.SendMsg("新用户注册", &message.MultipleSaveMsgReq{
 			UserIds: msg.E_userId,
-			Title:   gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.title", nil).String(),
-			Content: gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.content", nil).String(),
-			MsgType: gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.msgType", nil).Int64(),
-			Appid:   gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.appid", nil).String(),
-			Link: gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.pcUrl", nil).String() + "," +
-				gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.mobileUrl", nil).String() + "," +
-				gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.mobileUrl", nil).String() + "," +
-				gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.mobileUrl", nil).String(),
-			AppPushUrl: gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.mobileUrl", nil).String(),
-			WxPushUrl:  gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.mobileUrl", nil).String(),
-			IosPushUrl: gcfg.Instance().MustGet(gctx.New(), "newUserAward.message.mobileUrl", nil).String(),
+			Title:   gcfg.Instance().MustGet(gctx.New(), "newRegister.message.title", nil).String(),
+			Content: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.content", nil).String(),
+			MsgType: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.msgType", nil).Int64(),
+			Appid:   gcfg.Instance().MustGet(gctx.New(), "newRegister.message.appid", nil).String(),
+			Link: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.pcUrl", nil).String() + "," +
+				gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", nil).String() + "," +
+				gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", nil).String() + "," +
+				gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", nil).String(),
+			AppPushUrl: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", nil).String(),
+			WxPushUrl:  gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", nil).String(),
+			IosPushUrl: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", nil).String(),
 		})
 		if err != nil {
 			logger.Info("SendMsg Fail ", err)

+ 1 - 1
handler/activity/task.go

@@ -47,7 +47,7 @@ func Task(msg *model.Message) {
 	// p647新绑定用户送7天超级订阅
 	startTime := gtime.NewFromStrLayout(gcfg.Instance().MustGet(gctx.New(), "newRegister.startTime").String(), "2006-01-02T15:04:05Z").Time
 	entTime := gtime.NewFromStrLayout(gcfg.Instance().MustGet(gctx.New(), "newRegister.entTime").String(), "2006-01-02T15:04:05Z").Time
-	if time.Now().After(startTime) && time.Now().Before(entTime) {
+	if time.Now().After(startTime) && time.Now().Before(entTime) && gconv.Bool(msg.E_body["isOnlyBind"]) {
 		_ = award.GivenSubVip(msg.E_userId, award.SubVip{
 			Num:          gcfg.Instance().MustGet(gctx.New(), "newRegister.supVip", nil).Int64(),
 			ActivityCode: "newRegister",