Merge branch 'feature/tmr-group' of baishaojie/tmrgo into develop

models/feed_template.go

@@ -70,7 +70,7 @@ func NewFeedTemplateByGroup(pastureId int64, req *operationPb.DistributeFeedRequ
 	res.FeedFormulaDetail = make([]*FeedTemplateDetail, 0)
 	for _, v := range req.FeedFormulaDetail {
 		res.FeedFormulaDetail = append(res.FeedFormulaDetail, &FeedTemplateDetail{
-			PastureId:      int64(req.PastureId),
+			PastureId:      pastureId,
 			FId:            int64(v.ForageId),
 			FName:          v.ForageName,
 			FWeight:        float64(v.Weight / 100),

module/group.go

@@ -27,10 +27,11 @@ func DistributeFeedFormula(feedTemplateList []*models.FeedTemplate) error {
 		if len(feedTemplate.FeedFormulaDetail) <= 0 {
 			continue
 		}
+		zaplog.Info("======feedTemplate=====", zap.Any("before", feedTemplate))
 		if _, err := tx.Table(new(models.FeedTemplate)).Insert(feedTemplate); err != nil {
 			return err
 		}
-
+		zaplog.Info("======feedTemplate=====", zap.Any("after", feedTemplate))
 		feedFormulaDetail := make([]*models.FeedTemplateDetail, 0)
 		for _, f := range feedTemplate.FeedFormulaDetail {
 			f.FtId = feedTemplate.Id