Sfoglia il codice sorgente

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

wangfei 6 anni fa
parent
commit
bf01ce5589
3 ha cambiato i file con 17 aggiunte e 11 eliminazioni
  1. 7
    4
      models/luckdraw/luckdraw.go
  2. 2
    0
      service/luckdraw/luckdraw.go
  3. 8
    7
      service/user.go

+ 7
- 4
models/luckdraw/luckdraw.go Vedi File

112
 	// }
112
 	// }
113
 
113
 
114
 	// 保存中奖记录
114
 	// 保存中奖记录
115
-	var record = model.TaLuckdrawRecord{}
116
-	record.Id = utils.GetGUID()
115
+	var record = &model.TaLuckdrawRecord{}
116
+	// record.Id = utils.GetGUID()
117
 	record.OrgId = luckdraw.OrgId
117
 	record.OrgId = luckdraw.OrgId
118
 	record.CaseId = luckdraw.CaseId
118
 	record.CaseId = luckdraw.CaseId
119
 	record.PrizeId = prize.Id
119
 	record.PrizeId = prize.Id
122
 	record.UserName = user.CustomerName
122
 	record.UserName = user.CustomerName
123
 	record.UserHeadImg = user.Headimgurl
123
 	record.UserHeadImg = user.Headimgurl
124
 	record.LuckdrawId = luckdraw.Id
124
 	record.LuckdrawId = luckdraw.Id
125
-	_, err = m.SaveRecord(record)
125
+
126
+	utils.LogInfo("生成中奖记录:", *record)
127
+
128
+	record, err = m.SaveRecord(*record)
126
 	if err != nil {
129
 	if err != nil {
127
 		utils.LogError("保存中奖纪录失败:", err)
130
 		utils.LogError("保存中奖纪录失败:", err)
128
 		return nil, nil, nil, err
131
 		return nil, nil, nil, err
163
 		}
166
 		}
164
 	}
167
 	}
165
 
168
 
166
-	return prize, nil, &record, err
169
+	return prize, nil, record, err
167
 }
170
 }
168
 
171
 
169
 // PrizeWriteOff 奖品核销
172
 // PrizeWriteOff 奖品核销

+ 2
- 0
service/luckdraw/luckdraw.go Vedi File

41
 		return nil, nil, err
41
 		return nil, nil, err
42
 	}
42
 	}
43
 
43
 
44
+	utils.LogInfo("抽奖记录ID: " + recored.Id)
45
+
44
 	custQRCode := model.TaCustomerCourseQrcode{
46
 	custQRCode := model.TaCustomerCourseQrcode{
45
 		CustomerCourseId: recored.Id,
47
 		CustomerCourseId: recored.Id,
46
 		CustomerQrcode:   utils.GenerateQRCode(),
48
 		CustomerQrcode:   utils.GenerateQRCode(),

+ 8
- 7
service/user.go Vedi File

594
 		utils.LogError("获取人员信息失败: " + err.Error())
594
 		utils.LogError("获取人员信息失败: " + err.Error())
595
 		return nil, errors.New("获取人员信息失败")
595
 		return nil, errors.New("获取人员信息失败")
596
 	}
596
 	}
597
-	for inx, user := range users {
598
-		err := s.GetUserWithDetail(caseinfo.CaseId, &user)
599
-		if err != nil {
600
-			return nil, err
601
-		}
602
-		users[inx] = user
603
-	}
597
+	// 此处拆分到另外一个接口
598
+	// for inx, user := range users {
599
+	// 	err := s.GetUserWithDetail(caseinfo.CaseId, &user)
600
+	// 	if err != nil {
601
+	// 		return nil, err
602
+	// 	}
603
+	// 	users[inx] = user
604
+	// }
604
 	return users, nil
605
 	return users, nil
605
 }
606
 }
606
 
607