Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/services into dev

models/luckdraw/luckdraw.go

@@ -65,15 +65,15 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 	if time.Now().After(luckdraw.EndDate) {
 		return nil, nil, errors.New("活动已结束！")
 	}
-	if user.Phone != "" {
-		sysuser, err := m.GetUserByTel(user.Phone)
-		if err != nil {
-			return nil, nil, errors.New("获取信息失败！")
-		}
-		if sysuser != nil {
-			return nil, nil, errors.New("内部人员不允许进行抽奖！")
-		}
-	}
+	// if user.Phone != "" {
+	// 	sysuser, err := m.GetUserByTel(user.Phone)
+	// 	if err != nil {
+	// 		return nil, nil, errors.New("获取信息失败！")
+	// 	}
+	// 	if sysuser != nil {
+	// 		return nil, nil, errors.New("内部人员不允许进行抽奖！")
+	// 	}
+	// }
 	userluckdraws, err := m.GetUserRecordByLuckDraw(user.CustomerId, id)
 	if err != nil {
 		utils.LogError("获取用户抽奖信息失败:", err)

models/system/user.go

@@ -415,7 +415,7 @@ func (m *UserDAO) GetUserCustomer(userid, isrecommend, key string, page int, pag
 func (m *UserDAO) GetUserByName(userName string) (*model.SysUser, error) {
 	user := model.SysUser{}
 
-	has, err := m.db.Where("user_name=?", userName).Get(&user)
+	has, err := m.db.Where("user_name=?", userName).And("status>?", models.STATUS_DEL).Get(&user)
 	if err != nil {
 		return nil, err
 	}

service/bodycheck/bodycheck.go

@@ -38,7 +38,6 @@ func (s *BodyCheckServ) GetCheckByUser() (map[string]interface{}, error) {
 		return nil, err
 	}
 	if len(bodyCheck) == 0 {
-		utils.LogError("没有查询到数据:" + err.Error())
 		return nil, errors.New("log-error-没有查询到数据")
 	}
 	presentations, err := s.dao.GetPresentationByCheckID(bodyCheck[0].Id)
@@ -91,9 +90,6 @@ func (s *BodyCheckServ) PostCheckResult(formVal map[string]interface{}) error {
 	if customer == nil || customer.CustomerId == "" {
 		return errors.New("没有当前用户信息！")
 	}
-	beego.Error("—————————————————————————用户——————————————————————————")
-	beego.Error(customer)
-	beego.Error("+++++++++++++++++++++++++++++++++++++++++++++++++++++++")
 	userid := customer.CustomerId
 	checkinfo, err := s.dao.GetCheckByUserAndEquipmentID(userid, result.EquipmentId)
 	if err != nil {
@@ -110,30 +106,17 @@ func (s *BodyCheckServ) PostCheckResult(formVal map[string]interface{}) error {
 		if caseEquipment == nil || caseEquipment.EquipmentId == "" {
 			return errors.New("设备未维护！")
 		}
-		beego.Error("___________________设备——————————————————————————")
-		beego.Error(caseEquipment)
-		beego.Error("________________________________________________")
-
 		var checkNew = model.TaBodyCheck{}
 		checkNew.CaseId = caseEquipment.CaseId
 		checkNew.EquipmentId = result.EquipmentId
 		checkNew.UserId = userid
 		checkNew.ReportUrl = result.HMSReportUrl
 		checkNew.CreateDate = result.CheckDate
-		beego.Error("______checkNew___________________")
-		beego.Error(checkNew)
-		beego.Error("+++++++++++++++++++++++++++++++++")
 		checkinfo, err = s.dao.SaveBodyCheckInfo(checkNew)
-		beego.Error("____________checkInfo____________")
-		beego.Error(checkinfo)
-		beego.Error("__________________________________")
 		wxconf, _ := config.NewConfig("ini", "conf/wechat.conf")
 		messageTplID := wxconf.String("messageTplID")
 
 		org := s.ctx.Get("org").(model.SysOrg)
-		beego.Error("***************ORG******************")
-		beego.Error(org)
-		beego.Error("************************************")
 
 		utils.WxClientFor(org.OrgId).SendTplMessage(result.WechatAccount, messageTplID, beego.AppConfig.String("resultURL"), map[string]wx.TplMessageData{
 			"first": wx.TplMessageData{
@@ -156,9 +139,6 @@ func (s *BodyCheckServ) PostCheckResult(formVal map[string]interface{}) error {
 		utils.LogError("获取报告明细失败：", err)
 		return errors.New("获取报告明细失败")
 	}
-	beego.Error("________________presentation___________")
-	beego.Error(presentation)
-	beego.Error("_______________________________________")
 	if presentation == nil || presentation.Id == "" {
 		// 新增
 		var preNew = model.TaPresentation{}
@@ -195,9 +175,6 @@ func (s *BodyCheckServ) PostCheckResult(formVal map[string]interface{}) error {
 		utils.LogError("获取spec信息失败：", err)
 		return errors.New("获取spec信息失败")
 	}
-	beego.Error("_________checkSpec___________")
-	beego.Error(specs)
-	beego.Error("____________________________")
 
 	if len(formVal) > 0 {
 		var details []model.TaPresentationDetail