Browse Source

debug: 配方修改数据同步

Yi 1 year ago
parent
commit
62c7e8084f
3 changed files with 9 additions and 5 deletions
  1. 1 1
      models/feed_detail_version.go
  2. 1 1
      models/feed_detail_version_log.go
  3. 7 3
      module/group.go

+ 1 - 1
models/feed_detail_version.go

@@ -1,7 +1,7 @@
 package models
 
 type FeedDetailVersion struct {
-	Id             int64 `xorm:"AUTOINCR 'id'" json:"id,omitempty"`
+	Id             int64 `xorm:"AUTOINCR PK 'id'" json:"id,omitempty"`
 	PastureId      int64 `xorm:"pasture_id" json:"pasture_id"`
 	FeedTemplateId int64 `xorm:"feed_template_id" json:"feed_template_id"`
 	GroupVersion   int32 `xorm:"group_version" json:"group_version"`

+ 1 - 1
models/feed_detail_version_log.go

@@ -7,7 +7,7 @@ import (
 )
 
 type FeedDetailVersionLog struct {
-	Id                  int64                   `xorm:"id" json:"id,omitempty"`
+	Id                  int64                   `xorm:"AUTOINCR PK 'id'" json:"id,omitempty"`
 	PastureId           int64                   `xorm:"pasture_id" json:"pasture_id"`
 	VersionId           int64                   `xorm:"version_id" json:"version_id"`
 	FeedTemplateId      int64                   `xorm:"feed_template_id" json:"feed_template_id"`

+ 7 - 3
module/group.go

@@ -523,6 +523,7 @@ func FeedFormulaVersion(pastureId int64, req *models.FeedFormulaUpdateVersionReq
 
 	zaplog.Info("FeedFormulaVersion-Insert", zap.Any("feedDetailVersion", feedDetailVersion))
 	if _, err := DbSession.Insert(feedDetailVersion); err != nil {
+		zaplog.Error("FeedFormulaVersion-Insert", zap.Any("err", err))
 		DbSession.Rollback()
 		return err
 	}
@@ -545,9 +546,12 @@ func FeedFormulaVersion(pastureId int64, req *models.FeedFormulaUpdateVersionReq
 		})
 	}
 	zaplog.Info("versionLogs-Insert", zap.Any("versionLogs", versionLogs))
-	if _, err := DbSession.Table(new(models.FeedDetailVersionLog).TableName()).Insert(versionLogs); err != nil {
-		DbSession.Rollback()
-		return err
+	if len(versionLogs) > 0 {
+		if _, err := DbSession.Table(new(models.FeedDetailVersionLog).TableName()).Insert(versionLogs); err != nil {
+			zaplog.Error("FeedFormulaVersion-Insert", zap.Any("err", err))
+			DbSession.Rollback()
+			return err
+		}
 	}
 
 	return DbSession.Commit()