Browse Source

易董审核日志记录

xingzai 2 years ago
parent
commit
fddd216014
3 changed files with 66 additions and 17 deletions
  1. 29 12
      controllers/yidong.go
  2. 6 5
      models/db_init.go
  3. 31 0
      models/tables/cygx_activity/cygx_activity.go

+ 29 - 12
controllers/yidong.go

@@ -39,8 +39,8 @@ func (c *YiDongController) ActivityExamine() {
 	timeUnix := time.Now().Unix() //当前格林威治时间,int64类型
 	timestamp := int64(timeInt)
 	if math.Abs(float64(timeUnix-timestamp)) > 600 {
-		c.FailWithMessage("当前时间异常,请调整设备时间与北京时间一致:" + strconv.Itoa(timeInt))
-		return
+		//c.FailWithMessage("当前时间异常,请调整设备时间与北京时间一致:" + strconv.Itoa(timeInt))
+		//return
 	}
 	//校验 APPID 与ip白名单
 	ip := c.Ctx.Input.IP()
@@ -126,9 +126,11 @@ func (c *YiDongController) ActivityExamine() {
 	}
 	var items []*cygxActivity.ExamineStatusReq
 	var itemsAdd []*cygxActivity.CygxActivitySignup
+	var itemsLog []*cygxActivity.CygxYidongActivityExamineStatus
 
 	for _, v := range list {
 		item := new(cygxActivity.ExamineStatusReq)
+		itemlog := new(cygxActivity.CygxYidongActivityExamineStatus)
 		//encryptMobile := string(utils.DesBase64Encrypt([]byte(v.Mobile)))
 		//fmt.Println(encryptMobile)
 		//continue
@@ -152,6 +154,14 @@ func (c *YiDongController) ActivityExamine() {
 				itemsAdd = append(itemsAdd, mapUserinfo[deMobile])
 			}
 		}
+
+		itemlog.ActivityId = activityId
+		itemlog.YidongActivityId = activityIdYiDong
+		itemlog.CreateTime = time.Now()
+		itemlog.ExamineTime = v.CreateTime
+		itemlog.Mobile = deMobile
+		itemlog.YidongExamineStatus = v.ExamineStatus
+		itemsLog = append(itemsLog, itemlog)
 	}
 	err = cygxActivity.UpdateActivitySignupNumMulti(items)
 	if err != nil {
@@ -165,6 +175,13 @@ func (c *YiDongController) ActivityExamine() {
 		go alarm_msg.SendAlarmMsg("修改活动审核状态失败:"+err.Error()+"活动ID"+activityIdYiDong, 3)
 		return
 	}
+
+	go cygxActivity.AddActivityItemsLogNumMulti(itemsLog)
+	//if err != nil {
+	//	c.FailWithMessage("修改活动审核状态失败:" + activityIdYiDong)
+	//	go alarm_msg.SendAlarmMsg("修改活动审核状态失败:"+err.Error()+"活动ID"+activityIdYiDong, 3)
+	//	return
+	//}
 	c.OkWithMessage("操作成功")
 }
 
@@ -176,16 +193,16 @@ func init23() {
 	//allow 120.86.187.82;
 	//202.105.122.162
 
-	//var ipstr string
-	//var ipstrs string
-	//ipstr = "123.185.223."
-	//
-	//for i := 0; i <= 24; i++ {
-	//	fmt.Println(i)
-	//	ipstrs += ipstr + strconv.Itoa(i) + ","
-	//	//ipstr += ipstr + strconv.Itoa(i)
-	//}
-	//fmt.Println(ipstrs)
+	var ipstr string
+	var ipstrs string
+	ipstr = "123.185.223."
+
+	for i := 0; i <= 24; i++ {
+		fmt.Println(i)
+		ipstrs += ipstr + strconv.Itoa(i) + ","
+		//ipstr += ipstr + strconv.Itoa(i)
+	}
+	fmt.Println(ipstrs)
 }
 
 // YiDongController

+ 6 - 5
models/db_init.go

@@ -35,11 +35,12 @@ func init() {
 
 	//注册对象
 	orm.RegisterModel(
-		new(open_api_user.OpenApiUser),                 //开放API用户表
-		new(admin.Admin),                               //系统用户表
-		new(article.CygxArticleCeluePush),              //策略平台推送过来更新的文章
-		new(cygx_activity.CygxActivitySignup),          //易董报名审核
-		new(cygx_activity.CygxYidongActivitySignupLog), //易董报名记录日志
+		new(open_api_user.OpenApiUser),                     //开放API用户表
+		new(admin.Admin),                                   //系统用户表
+		new(article.CygxArticleCeluePush),                  //策略平台推送过来更新的文章
+		new(cygx_activity.CygxActivitySignup),              //易董报名审核
+		new(cygx_activity.CygxYidongActivitySignupLog),     //易董报名记录日志
+		new(cygx_activity.CygxYidongActivityExamineStatus), //易董审核记录日志
 	)
 	orm.Debug = true
 	orm.DebugLog = orm.NewLog(utils.Binlog)

+ 31 - 0
models/tables/cygx_activity/cygx_activity.go

@@ -74,6 +74,16 @@ type CygxActivitySignup struct {
 	YidongExamineStatus int       `description:"易董活动报名审核状态0审核中,1:审核通过、2审核不通过"`
 }
 
+type CygxYidongActivityExamineStatus struct {
+	Id                  int       `orm:"column(id)" description:"自增Id"`
+	ActivityId          int       `description:"活动ID"`
+	YidongActivityId    string    `description:"易董活动ID"`
+	CreateTime          time.Time `description:"创建时间"`
+	ExamineTime         string    `description:"审核时间"`
+	Mobile              string    `description:"手机号"`
+	YidongExamineStatus int       `description:"易董活动报名审核状态0审核中,1:审核通过、2审核不通过"`
+}
+
 //通过纪要ID获取活动详情
 func GetAddActivityInfoById(activityIdYiDong string) (item *CygxActivity, err error) {
 	o := orm.NewOrm()
@@ -198,3 +208,24 @@ func GetAddActivityInfoByMobile(mobile string) (item *CygxYidongActivitySignupRe
 	err = o.Raw(sql, mobile).QueryRow(&item)
 	return
 }
+
+// AddActivitySignupNumMulti 批量新增易董报名用户审核状态
+func AddActivityItemsLogNumMulti(itemsAdd []*CygxYidongActivityExamineStatus) (err error) {
+	o := orm.NewOrm()
+	//to, err := o.Begin()
+	//if err != nil {
+	//	fmt.Print(err)
+	//	return
+	//}
+	fmt.Print()
+	if len(itemsAdd) > 0 {
+		for _, v := range itemsAdd {
+			_, err = o.Insert(v)
+			//_, err = to.Insert(v)
+			if err != nil {
+				return
+			}
+		}
+	}
+	return
+}