Merge branch 'dev4.6.3.9' of http://192.168.3.207:8080/qmx/jy into dev4.6.3.9

src/jfw/modules/subscribepay/src/util/msgremind.go

@@ -343,14 +343,14 @@ func (m *msgRemind) run() {
 			if isPushWx == 1 && s_m_openid != "" {
 				wtmc := Unpaid_WTMCS.Get(MessageConfig.WxTpl_Unpaid.First.Value)
 				if wtmc != nil {
-
+					expireTime := unpaidOrder.createTime + m.getExpireTime()
 					tmplData := map[string]*qrpc.TmplItem{
 						"first": &qrpc.TmplItem{
 							Value: strings.ReplaceAll(wtmc.FirstData, "@订单号", unpaidOrder.orderCode),
 							Color: MessageConfig.WxTpl_Unpaid.First.Color,
 						},
 						"keyword1": &qrpc.TmplItem{
-							Value: util.FormatDateByInt64(&unpaidOrder.createTime, util.Date_Short_Layout),
+							Value: productType + m.getVipType(unpaidOrder.vipType),
 						},
 						"keyword2": &qrpc.TmplItem{
 							Value: unpaidOrder.orderCode,
@@ -359,7 +359,7 @@ func (m *msgRemind) run() {
 							Value: fmt.Sprintf(MessageConfig.WxTpl_Unpaid.Keyword3.Value, fmt.Sprintf("%.2f", float64(unpaidOrder.orderMoney)/100)),
 						},
 						"keyword4": &qrpc.TmplItem{
-							Value: fmt.Sprintf(MessageConfig.WxTpl_Unpaid.Keyword4.Value, productType+m.getVipType(unpaidOrder.vipType)),
+							Value: fmt.Sprintf(MessageConfig.WxTpl_Unpaid.Keyword4.Value, util.FormatDateByInt64(&expireTime, util.Date_Short_Layout)),
 						},
 					}
 					if remind_status == 2 {