Merge branch 'dev/v4.8.93_fuwencai' of qmx/jy into feature/v4.8.93

src/jfw/modules/subscribepay/src/config.json

@@ -1,5 +1,4 @@
 {
-  "smsServiceRpc": "192.168.3.149:932",
   "mongodbServers": "192.168.3.206:27080",
   "mongodbPoolSize": 10,
   "mongodbName": "qfw",
@@ -164,9 +163,9 @@
     "open": true,
     "siteMsg": {
       "callPlatform": "subscribepay",
-      "msgType": 2,
+      "msgType": 13,
       "title": "%s已到账，戳我解锁！",
-      "content": "购买%s产品赠送%s已到账。兑换码%s。兑换截止日期：%s，请前往腾讯视频进行兑换解锁福利。",
+      "content": "购买%s产品赠送%s已到账。兑换码%s。兑换截止日期：%s，请前往腾讯视频进行兑换解锁福利。#jy#购买%s赠送%s#jy#兑换码%s。请前往腾讯视频进行兑换解锁福利。",
       "link": "",
       "androidUrl": "",
       "iosUrl": "",

src/jfw/modules/subscribepay/src/entity/equityActive.go

@@ -204,7 +204,7 @@ func (e *EquityActive) sendVipMsg(eName, code, ex_end_time string) {
 		UserIds:     e.mgoId,
 		PositionIds: e.positionId,
 		Title:       fmt.Sprintf(siteMsg.Title, eName),
-		Content:     fmt.Sprintf(siteMsg.Content, e.ProductType, eName, code, ex_end_time),
+		Content:     fmt.Sprintf(siteMsg.Content, e.ProductType, eName, code, ex_end_time, e.ProductType, eName, code),
 		MsgType:     siteMsg.MsgType,
 		SendMode:    2,
 	}