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

migration/v0001_feedtemplet.sql

@@ -259,4 +259,7 @@ CREATE TABLE `feed_detail_version_log` (
    `updated` datetime NOT NULL COMMENT '更新时间',
    PRIMARY KEY (`id`),
    KEY `idx_feed_template_id` (`feed_template_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='集团端最新配方详情表'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='集团端最新配方详情表';
+
+ALTER TABLE ftdetail DROP INDEX ftdetail_ftid,
+ADD UNIQUE KEY ftdetail_ftid (`ftid`,`fid`,`pastureid`,`is_show`);

module/group.go

@@ -658,7 +658,6 @@ func SearchFeedDetailVersionLogById(ctx context.Context, pastureId, feedTemplate
 
 // FeetTemplateUpgradeNewVersion 配方更新至最新版本
 func FeetTemplateUpgradeNewVersion(ctx context.Context, pastureId, feedTemplateId int64) error {
-
 	feedTemplateData, err := SearchFeedTemplateById(ctx, pastureId, feedTemplateId)
 	if err != nil {
 		return err
@@ -669,10 +668,6 @@ func FeetTemplateUpgradeNewVersion(ctx context.Context, pastureId, feedTemplateI
 		return err
 	}
 
-	defer func() {
-
-	}()
-
 	DBSession := restful.Engine.NewSession()
 	defer DBSession.Close()
 
@@ -722,5 +717,12 @@ func FeetTemplateUpgradeNewVersion(ctx context.Context, pastureId, feedTemplateI
 		return err
 	}
 
+	if _, err = DBSession.Table(new(models.FeedTemplate).TableName()).
+		Where("pastureid = ?", pastureId).
+		And("id = ?", feedTemplateId).
+		Update(map[string]interface{}{"group_version": newFeedDetailVersion.Id}); err != nil {
+		return err
+	}
+
 	return DBSession.Commit()
 }

service/group/feed_template.go

@@ -138,5 +138,10 @@ func GetFeetTemplateVersion(ctx context.Context, pastureId, feedTemplateId int)
 }
 
 func FeetTemplateUpgradeNewVersion(ctx context.Context, pastureId, feedTemplateId int) error {
-	return module.FeetTemplateUpgradeNewVersion(ctx, int64(pastureId), int64(feedTemplateId))
+	if err := module.FeetTemplateUpgradeNewVersion(ctx, int64(pastureId), int64(feedTemplateId)); err != nil {
+		return err
+	} else {
+
+		return nil
+	}
 }