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

models/bodycheck/bodycheck.go

@@ -124,7 +124,7 @@ func (m *DAO) UpdatePresentation(info *model.TaPresentation) error {
 		"check_result",
 		"report_url",
 	}
-	_, err := m.db.Update(info, cols, "id=?", info.Id)
+	_, err := m.db.Cols(cols...).Where("id = ?", info.Id).Update(info)
 	return err
 }
 

models/luckdraw/luckdraw.go

@@ -123,6 +123,10 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 	record.UserHeadImg = user.Headimgurl
 	record.LuckdrawId = luckdraw.Id
 	_, err = m.SaveRecord(record)
+	if err != nil {
+		utils.LogError("保存中奖纪录失败：", err)
+		return nil, nil, err
+	}
 	// var detail = model.TaPrizeDetail{}
 	// if len(details) > 0 {
 	// 	// 更新中奖纪录明细
@@ -145,6 +149,7 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 		prize.Remainder = prize.Remainder - 1
 		err = m.UpdateStock(prize)
 		if err != nil {
+			utils.LogError("更新库存失败：", err)
 			return nil, nil, err
 		}
 		stockprizes, err := m.GetPrizeStock(id)
@@ -254,7 +259,7 @@ func (m *LuckDrawDao) UpdateLuckDrawEndDate(id string) error {
 	cols := []string{
 		"end_date",
 	}
-	_, err := m.db.Update(luckdraw, cols, "id=?", id)
+	_, err := m.db.Cols(cols...).Where("id=?", id).Update(luckdraw)
 	return err
 }
 
@@ -270,7 +275,7 @@ func (m *LuckDrawDao) UpdateStock(prize *model.TaLuckdrawPrize) error {
 	cols := []string{
 		"remainder",
 	}
-	_, err := m.db.Update(prize, cols, "id=?", prize.Id)
+	_, err := m.db.Cols(cols...).Where("id=?", prize.Id).Update(prize)
 	return err
 }
 
@@ -320,7 +325,7 @@ func (m *LuckDrawDao) UpdatePrizeDetail(detail model.TaPrizeDetail) error {
 		"receive_id",
 		"receive_date",
 	}
-	_, err := m.db.Update(detail, cols, "id=?", detail.Id)
+	_, err := m.db.Cols(cols...).Where("id=?", detail.Id).Update(detail)
 	return err
 }
 
@@ -332,7 +337,7 @@ func (m *LuckDrawDao) UpdateRecord(record *LuckInfo) error {
 		"status",
 		"writeoff_date",
 	}
-	_, err := m.db.Update(record, cols, "id=?", record.Id)
+	_, err := m.db.Cols(cols...).Where("id=?", record.Id).Update(record)
 	return err
 }
 

models/system/user.go

@@ -41,7 +41,7 @@ func (m *UserDAO) GetUserList(username, typeid, caseids string, page int, pageSi
 		INNER join td_user_type b on a.type_id = b.type_id
 		group by a.user_id) c on user.user_id = c.user_id where user.user_id != '` + models.ADMIN_ID + `' and
 		(status> ` + strconv.Itoa(models.STATUS_DEL) + ` and user_name like '%` + username + `%' and user.user_id in 
-		(select user_id from sys_user_case where case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
+		(select user_id from sys_user_case where is_belong=1 and case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
 
 	if typeid != "" {
 		sql = sql + " and user.user_id in (select user_id from sys_user_type where type_id = '" + typeid + "')"
@@ -60,7 +60,7 @@ func (m *UserDAO) GetUserCount(username, typeid, caseids string) (int, error) {
 		INNER join td_user_type b on a.type_id = b.type_id
 		group by a.user_id) c on user.user_id = c.user_id where user.user_id != '` + models.ADMIN_ID + `' and
 		(status> ` + strconv.Itoa(models.STATUS_DEL) + ` and user_name like '%` + username + `%' and user.user_id in 
-		(select user_id from sys_user_case where case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
+		(select user_id from sys_user_case where is_belong=1 and case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
 
 	if typeid != "" {
 		sql = sql + " and user.user_id in (select user_id from sys_user_type where type_id = '" + typeid + "')"

service/luckdraw/luckdraw.go

@@ -37,6 +37,7 @@ func (s *LuckdrawServ) GetLuckDraw(id string) (*luckdraw.LuckDraw, error) {
 func (s *LuckdrawServ) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuckdrawPrize, *model.TaPrizeDetail, error) {
 	prize, prizeDetail, err := s.dao.LuckDraw(id, user)
 	if err != nil {
+		utils.LogError("抽奖失败：", err)
 		return nil, nil, err
 	}
 	return prize, prizeDetail, nil