xingzai hace 1 año
padre
commit
fc32bdeb1c
Se han modificado 2 ficheros con 41 adiciones y 30 borrados
  1. 40 29
      controllers/activity_sign.go
  2. 1 1
      utils/config.go

+ 40 - 29
controllers/activity_sign.go

@@ -248,44 +248,55 @@ func (this *ActivitySignCoAntroller) ByHand() {
 		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return
 	}
-	if signinType == 1 {
-		if req.Mobile == "" {
-			br.Msg = "参数错误"
-			br.ErrMsg = "参数错误,手机号为空 为空"
-			return
-		}
-		itemMsgCode, err := models.GetMsgCode(req.Mobile, req.VCode)
-		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
-				br.Msg = "验证码错误,请重新输入"
-				br.ErrMsg = "校验验证码失败,Err:" + err.Error()
+	if user.Mobile == "" {
+		if signinType == 1 {
+			if req.Mobile == "" {
+				br.Msg = "参数错误"
+				br.ErrMsg = "参数错误,手机号为空 为空"
 				return
-			} else {
+			}
+			itemMsgCode, err := models.GetMsgCode(req.Mobile, req.VCode)
+			if err != nil {
+				if err.Error() == utils.ErrNoRow() {
+					br.Msg = "验证码错误,请重新输入"
+					br.ErrMsg = "校验验证码失败,Err:" + err.Error()
+					return
+				} else {
+					br.Msg = "验证码错误,请重新输入"
+					br.ErrMsg = "校验验证码失败,Err:" + err.Error()
+					return
+				}
+			}
+			if itemMsgCode == nil {
 				br.Msg = "验证码错误,请重新输入"
-				br.ErrMsg = "校验验证码失败,Err:" + err.Error()
 				return
 			}
+			userMobile, err := models.GetWxUserItemByMobile(Mobile)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "签到失败"
+				br.ErrMsg = "获取失败,Err:" + err.Error()
+				return
+			}
+			if userMobile != nil {
+				user = userMobile
+			}
+		} else {
+			if BusinessCard == "" {
+				br.Msg = "签到失败"
+				br.ErrMsg = "签到失败名片地址为空,Err:"
+				return
+			}
+			item.BusinessCard = BusinessCard
 		}
-		if itemMsgCode == nil {
-			br.Msg = "验证码错误,请重新输入"
-			return
-		}
-		userMobile, err := models.GetWxUserItemByMobile(Mobile)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "签到失败"
-			br.ErrMsg = "获取失败,Err:" + err.Error()
+	} else {
+		if CompanyName == "" {
+			br.Msg = "请输入公司名称"
 			return
 		}
-		if userMobile != nil {
-			user = userMobile
-		}
-	} else {
-		if BusinessCard == "" {
-			br.Msg = "签到失败"
-			br.ErrMsg = "签到失败名片地址为空,Err:"
+		if RealName == "" {
+			br.Msg = "请输入姓名"
 			return
 		}
-		item.BusinessCard = BusinessCard
 	}
 	item.ActivityId = activityId
 	item.UserId = user.UserId

+ 1 - 1
utils/config.go

@@ -228,7 +228,7 @@ func init() {
 		WxMsgTemplateIdApplyCancelXzs = "UU_d7ks0XZBnWg2xFzxL9Heilm4kisX39K7dr4SDdO8"         ////预约取消提醒(小助手)
 		TemplateIdByProductXzs = "-YjuPOB7Fqd-S3ilabYa6wvjDY9aXmeEfPN6DCiy-EY"                //产品运行报告通知-模板ID(小助手)
 		WxMsgTemplateIdActivityChangeApplyXzs = "CB7bOl7f3viMG4s1uhRo7WM0Jbx3WvodKuIZ8A_z8fM" //查研观向活动变更通知-模板ID(小助手)
-		WxMsgTemplateIdActivitySign = "CB7bOl7f3viMG4s1uhRo7WM0Jbx3WvodKuIZ8A_z8fM"           //查研观向活动签到通知-模板ID(小助手)
+		WxMsgTemplateIdActivitySign = "3l5cxpqH6c9kkLe9ow7qzqd0uYEOdY3A_PB8wRWkiHk"           //查研观向活动签到通知-模板ID(小助手)
 	} else {
 		//新的模板ID
 		WxPublicIdXzs = "wxb7cb8a15abad5b8e"                                                  //查研观向小助手