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

models/luckdraw/luckdraw.go

@@ -112,8 +112,8 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 	// }
 
 	// 保存中奖记录
-	var record = model.TaLuckdrawRecord{}
-	record.Id = utils.GetGUID()
+	var record = &model.TaLuckdrawRecord{}
+	// record.Id = utils.GetGUID()
 	record.OrgId = luckdraw.OrgId
 	record.CaseId = luckdraw.CaseId
 	record.PrizeId = prize.Id
@@ -122,7 +122,10 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 	record.UserName = user.CustomerName
 	record.UserHeadImg = user.Headimgurl
 	record.LuckdrawId = luckdraw.Id
-	_, err = m.SaveRecord(record)
+
+	utils.LogInfo("生成中奖记录:", *record)
+
+	record, err = m.SaveRecord(*record)
 	if err != nil {
 		utils.LogError("保存中奖纪录失败：", err)
 		return nil, nil, nil, err
@@ -163,7 +166,7 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 		}
 	}
 
-	return prize, nil, &record, err
+	return prize, nil, record, err
 }
 
 // PrizeWriteOff 奖品核销

service/luckdraw/luckdraw.go

@@ -41,6 +41,8 @@ func (s *LuckdrawServ) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuc
 		return nil, nil, err
 	}
 
+	utils.LogInfo("抽奖记录ID: " + recored.Id)
+
 	custQRCode := model.TaCustomerCourseQrcode{
 		CustomerCourseId: recored.Id,
 		CustomerQrcode:   utils.GenerateQRCode(),

service/user.go

@@ -594,13 +594,14 @@ func (s *UserServ) GetCaseUserByType(usertype string) ([]system.UserWithCouponAn
 		utils.LogError("获取人员信息失败: " + err.Error())
 		return nil, errors.New("获取人员信息失败")
 	}
-	for inx, user := range users {
-		err := s.GetUserWithDetail(caseinfo.CaseId, &user)
-		if err != nil {
-			return nil, err
-		}
-		users[inx] = user
-	}
+	// 此处拆分到另外一个接口
+	// for inx, user := range users {
+	// 	err := s.GetUserWithDetail(caseinfo.CaseId, &user)
+	// 	if err != nil {
+	// 		return nil, err
+	// 	}
+	// 	users[inx] = user
+	// }
 	return users, nil
 }