|
@@ -4,6 +4,8 @@ package front
|
|
import (
|
|
import (
|
|
. "app/jyutil"
|
|
. "app/jyutil"
|
|
"fmt"
|
|
"fmt"
|
|
|
|
+ "jfw/config"
|
|
|
|
+ "log"
|
|
"qfw/util"
|
|
"qfw/util"
|
|
"regexp"
|
|
"regexp"
|
|
"strconv"
|
|
"strconv"
|
|
@@ -204,14 +206,34 @@ func (m *Front) WxKeysetAjaxReq() {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
saveKey := map[string]interface{}{
|
|
saveKey := map[string]interface{}{
|
|
- "key": keys,
|
|
|
|
|
|
+ "key": []string{keys[0]},
|
|
"area": fliterEmptyArr(area),
|
|
"area": fliterEmptyArr(area),
|
|
"notkey": fliterEmptyArr(notkey),
|
|
"notkey": fliterEmptyArr(notkey),
|
|
"infotype": fliterEmptyArr(infotype),
|
|
"infotype": fliterEmptyArr(infotype),
|
|
}
|
|
}
|
|
|
|
+ var optime time.Time
|
|
|
|
+ var regtime int64
|
|
|
|
+ if rd, ok := mongodb.FindById("user", userId, `{"o_jy":1,"l_registedate":1}`); rd != nil && ok && len(*rd) > 0 {
|
|
|
|
+ //获取活动上线时间
|
|
|
|
+ optimalTime, _ := config.Sysconfig["optimalTime"].(string)
|
|
|
|
+ optime, _ = time.ParseInLocation(util.Date_Full_Layout, optimalTime, time.Local)
|
|
|
|
+ regtime, _ = (*rd)["l_registedate"].(int64)
|
|
|
|
+ if ojy, _ := (*rd)["o_jy"].(map[string]interface{}); len(ojy) > 0 {
|
|
|
|
+ if ojy["i_new"] == nil {
|
|
|
|
+ if time.Unix(regtime, 0).After(optime) {
|
|
|
|
+ saveData["o_jy.i_new"] = 1
|
|
|
|
+ } else {
|
|
|
|
+ saveData["o_jy.i_new"] = 0
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
if !a_key_ok && indexInt == 0 { //第一次新增
|
|
if !a_key_ok && indexInt == 0 { //第一次新增
|
|
index = ""
|
|
index = ""
|
|
saveData["o_jy.a_key"] = []map[string]interface{}{saveKey}
|
|
saveData["o_jy.a_key"] = []map[string]interface{}{saveKey}
|
|
|
|
+ if time.Unix(regtime, 0).Before(optime) {
|
|
|
|
+ saveData["o_jy.i_new"] = 1
|
|
|
|
+ }
|
|
} else { //修改新增
|
|
} else { //修改新增
|
|
if indexInt > len(a_key) {
|
|
if indexInt > len(a_key) {
|
|
indexInt = len(a_key)
|
|
indexInt = len(a_key)
|