feat:共创合约编辑增加合约变更记录

陈志颖
pkg/application/cooperationContract/service/cooperation_contract.go
pkg/application/dividendsReturnedOrder/command/create_dividends_returned_order.go
pkg/application/dividendsReturnedOrder/service/dividends_returned_order.go
pkg/domain/cooperation_contract.go
pkg/domain/cooperation_contract_change_log.go
pkg/infrastructure/pg/models/cooperation_contract_change_log.go
pkg/infrastructure/repository/pg_cooperation_contract_change_log_repository.go
--- a/pkg/application/cooperationContract/service/cooperation_contract.go
查看文件 @c5ba65e
+++ b/pkg/application/cooperationContract/service/cooperation_contract.go
查看文件 @c5ba65e
@@ -801,6 +801,14 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC
 		sponsor = data
 	}
+	// 获取操作人
+	var operator *domain.User
+	if data, err := userService.OperatorFrom(updateCooperationContractCommand.CompanyId, updateCooperationContractCommand.OrgId, updateCooperationContractCommand.UserId); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		operator = data
+	}
+
 	// 更新发起人
 	cooperationContract.CooperationContractSponsor = sponsor
@@ -947,28 +955,183 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC
 	// 更新金额激励规则列表
 	cooperationContract.MoneyIncentivesRules = moneyIncentivesRules
+	// 判断激励规则变更
+	incentivesType := 0
+	if len(dividendsIncentivesRules) > 0 {
+		incentivesType = domain.TYPE_DIVIDNEDS_INCENTIVES
+	} else if len(moneyIncentivesRules) > 0 {
+		incentivesType = domain.TYPE_MONEY_INCENTIVES
+	}
+	cooperationContract.IncentivesType = int32(incentivesType)
+
 	// 保存共创合约变更
 	if cooperationContractSaved, err19 := cooperationContractRepository.Save(cooperationContract); err19 != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err19.Error())
 	} else {
-		// TODO 保存共创合约变更记录
-		var incentivesRule string
-		var incentivesRuleDetail string
-		if cooperationContractFound.IncentivesType != cooperationContractSaved.IncentivesType { // 1.激励规则变更
+		// 保存共创合约变更记录
+		// 原【（激励阶段：激励百分点，阶段有效期，推荐人抽点，关联业务员抽点），（激励阶段：激励百分点，阶段有效期，推荐人抽点，关联业务员抽点）】-->更新后【（激励阶段：激励百分点，阶段有效期，推荐人抽点，关联业务员抽点）】
+		var incentivesRuleChange string
+		var incentivesRuleChangeDetail string
+		if cooperationContractFound.IncentivesType != cooperationContractSaved.IncentivesType && cooperationContractFound.IncentivesType == domain.TYPE_DIVIDNEDS_INCENTIVES && cooperationContractSaved.IncentivesType == domain.TYPE_MONEY_INCENTIVES { // 1.激励类型变更
+			// 业绩分红-->金额激励
+			incentivesRuleChange = cooperationContract.ReturnIncentivesName(domain.IncentivesType(cooperationContractFound.IncentivesType)) + "-->" + cooperationContract.ReturnIncentivesName(domain.IncentivesType(cooperationContractSaved.IncentivesType))
+
+			//【第一阶段：20，2021-01-01~2021-12-31，，，；第二阶段：20，2021-01-01~2021-12-31，30，10】变更为【第一阶段：20，2021-01-01~2021-12-31，，，；】
+			// 原业绩分红激励规则
+			var dividendsIncentivesRuleOriginal string
+			for _, dividendsIncentivesRule := range cooperationContractFound.DividendsIncentivesRules {
+				dividendsIncentivesRuleOriginal = dividendsIncentivesRuleOriginal + dividendsIncentivesRule.DividendsIncentivesStageCN +
+					"：" + fmt.Sprint(dividendsIncentivesRule.DividendsIncentivesPercentage) +
+					"，" + dividendsIncentivesRule.DividendsIncentivesStageStart.Format("2006-01-02") +
+					"~" + dividendsIncentivesRule.DividendsIncentivesStageEnd.Format("2006-01-02") +
+					"，" + fmt.Sprint(dividendsIncentivesRule.ReferrerPercentage) +
+					"，" + fmt.Sprint(dividendsIncentivesRule.SalesmanPercentage) + ";"
+			}
+			dividendsIncentivesRuleOriginalTmp := "【" + dividendsIncentivesRuleOriginal + "】"
+
+			// 变更后的金额激励规则
+			var moneyIncentivesRuleChanged string
+			for _, moneyIncentivesRule := range cooperationContractSaved.MoneyIncentivesRules {
+				moneyIncentivesRuleChanged = moneyIncentivesRuleChanged + moneyIncentivesRule.MoneyIncentivesStageCN +
+					"：" +
+					"，" + moneyIncentivesRule.MoneyIncentivesStageStart.Format("2006-01-02") +
+					"，" + fmt.Sprint(moneyIncentivesRule.ReferrerPercentage) +
+					"，" + fmt.Sprint(moneyIncentivesRule.SalesmanPercentage) + ";"
+			}
+			moneyIncentivesRuleOriginalTmp := "【" + moneyIncentivesRuleChanged + "】"
+
+			// 拼接规则变更
+			incentivesRuleChangeDetail = dividendsIncentivesRuleOriginalTmp + " 变更为 " + moneyIncentivesRuleOriginalTmp
+		} else if cooperationContractFound.IncentivesType != cooperationContractSaved.IncentivesType && cooperationContractFound.IncentivesType == domain.TYPE_MONEY_INCENTIVES && cooperationContractSaved.IncentivesType == domain.TYPE_DIVIDNEDS_INCENTIVES {
+			//	金额激励-->业绩分红
+			incentivesRuleChange = cooperationContract.ReturnIncentivesName(domain.IncentivesType(cooperationContractFound.IncentivesType)) + "-->" + cooperationContract.ReturnIncentivesName(domain.IncentivesType(cooperationContractSaved.IncentivesType))
+			//【第一阶段：20，2021-01-01~2021-12-31，，，；第二阶段：20，2021-01-01~2021-12-31，30，10】变更为【第一阶段：20，2021-01-01~2021-12-31，，，；】
+
+			// 原金额激励规则
+			var moneyIncentivesRuleOriginal string
+			for _, moneyIncentivesRule := range cooperationContractFound.MoneyIncentivesRules {
+				moneyIncentivesRuleOriginal = moneyIncentivesRuleOriginal + moneyIncentivesRule.MoneyIncentivesStageCN +
+					"：" +
+					"，" + moneyIncentivesRule.MoneyIncentivesStageStart.Format("2006-01-02") +
+					"，" + fmt.Sprint(moneyIncentivesRule.ReferrerPercentage) +
+					"，" + fmt.Sprint(moneyIncentivesRule.SalesmanPercentage) + ";"
+			}
+			moneyIncentivesRuleOriginalTmp := "【" + moneyIncentivesRuleOriginal + "】"
+			// 变更后的业绩分红激励规则
+			var dividendsIncentivesRuleChanged string
+			for _, dividendsIncentivesRule := range cooperationContractSaved.DividendsIncentivesRules {
+				dividendsIncentivesRuleChanged = dividendsIncentivesRuleChanged + dividendsIncentivesRule.DividendsIncentivesStageCN +
+					"：" + fmt.Sprint(dividendsIncentivesRule.DividendsIncentivesPercentage) +
+					"，" + dividendsIncentivesRule.DividendsIncentivesStageStart.Format("2006-01-02") +
+					"~" + dividendsIncentivesRule.DividendsIncentivesStageEnd.Format("2006-01-02") +
+					"，" + fmt.Sprint(dividendsIncentivesRule.ReferrerPercentage) +
+					"，" + fmt.Sprint(dividendsIncentivesRule.SalesmanPercentage) + ";"
+			}
+			dividendsIncentivesRuleOriginalTmp := "【" + dividendsIncentivesRuleChanged + "】"
+
+			// 拼接规则变更
+			incentivesRuleChangeDetail = moneyIncentivesRuleOriginalTmp + " 变更为 " + dividendsIncentivesRuleOriginalTmp
+		} else { // 2.激励规则变更
+			if cooperationContractFound.IncentivesType == domain.TYPE_DIVIDNEDS_INCENTIVES { // 业绩分红激励规则变更
+				if !cooperationContract.DividendsIncentivesRuleSliceEqualBCE(cooperationContractFound.DividendsIncentivesRules, cooperationContractSaved.DividendsIncentivesRules) {
+					//	业绩分红-->业绩分红
+					incentivesRuleChange = cooperationContract.ReturnIncentivesName(domain.IncentivesType(cooperationContractFound.IncentivesType)) + "-->" + cooperationContract.ReturnIncentivesName(domain.IncentivesType(cooperationContractSaved.IncentivesType))
+					//【第一阶段：20，2021-01-01~2021-12-31，，，；第二阶段：20，2021-01-01~2021-12-31，30，10】变更为【第一阶段：20，2021-01-01~2021-12-31，，，；】
+
+					// 原业绩分红激励规则
+					var dividendsIncentivesRuleOriginal string
+					for _, dividendsIncentivesRule := range cooperationContractFound.DividendsIncentivesRules {
+						dividendsIncentivesRuleOriginal = dividendsIncentivesRuleOriginal + dividendsIncentivesRule.DividendsIncentivesStageCN +
+							"：" + fmt.Sprint(dividendsIncentivesRule.DividendsIncentivesPercentage) +
+							"，" + dividendsIncentivesRule.DividendsIncentivesStageStart.Format("2006-01-02") +
+							"~" + dividendsIncentivesRule.DividendsIncentivesStageEnd.Format("2006-01-02") +
+							"，" + fmt.Sprint(dividendsIncentivesRule.ReferrerPercentage) +
+							"，" + fmt.Sprint(dividendsIncentivesRule.SalesmanPercentage) + ";"
+					}
+					dividendsIncentivesRuleOriginalTmp := "【" + dividendsIncentivesRuleOriginal + "】"
+
+					// 变更后的业绩分红激励规则
+					var dividendsIncentivesRuleChanged string
+					for _, dividendsIncentivesRule := range cooperationContractSaved.DividendsIncentivesRules {
+						dividendsIncentivesRuleChanged = dividendsIncentivesRuleChanged + dividendsIncentivesRule.DividendsIncentivesStageCN +
+							"：" + fmt.Sprint(dividendsIncentivesRule.DividendsIncentivesPercentage) +
+							"，" + dividendsIncentivesRule.DividendsIncentivesStageStart.Format("2006-01-02") +
+							"~" + dividendsIncentivesRule.DividendsIncentivesStageEnd.Format("2006-01-02") +
+							"，" + fmt.Sprint(dividendsIncentivesRule.ReferrerPercentage) +
+							"，" + fmt.Sprint(dividendsIncentivesRule.SalesmanPercentage) + ";"
+					}
+					dividendsIncentivesRuleChangedTmp := "【" + dividendsIncentivesRuleChanged + "】"
+
+					// 拼接规则变更
+					incentivesRuleChangeDetail = dividendsIncentivesRuleOriginalTmp + " 变更为 " + dividendsIncentivesRuleChangedTmp
+				}
+			} else if cooperationContractFound.IncentivesType == domain.MONEY_INCENTIVES { // 金额激励规则变更
+				if !cooperationContract.MoneyIncentivesRuleSliceEqualBCE(cooperationContractFound.MoneyIncentivesRules, cooperationContractSaved.MoneyIncentivesRules) {
+					incentivesRuleChange = cooperationContract.ReturnIncentivesName(domain.IncentivesType(cooperationContractFound.IncentivesType)) + "-->" + cooperationContract.ReturnIncentivesName(domain.IncentivesType(cooperationContractSaved.IncentivesType))
+					//【第一阶段：20，2021-01-01~2021-12-31，，，；第二阶段：20，2021-01-01~2021-12-31，30，10】变更为【第一阶段：20，2021-01-01~2021-12-31，，，；】
+
+					// 原金额激励规则
+					var moneyIncentivesRuleOriginal string
+					for _, moneyIncentivesRule := range cooperationContractFound.MoneyIncentivesRules {
+						moneyIncentivesRuleOriginal = moneyIncentivesRuleOriginal + moneyIncentivesRule.MoneyIncentivesStageCN +
+							"：" +
+							"，" + moneyIncentivesRule.MoneyIncentivesStageStart.Format("2006-01-02") +
+							"，" + fmt.Sprint(moneyIncentivesRule.ReferrerPercentage) +
+							"，" + fmt.Sprint(moneyIncentivesRule.SalesmanPercentage) + ";"
+					}
+					moneyIncentivesRuleOriginalTmp := "【" + moneyIncentivesRuleOriginal + "】"
+
+					// 变更后的激励规则
+					var moneyIncentivesRuleChanged string
+					for _, moneyIncentivesRule := range cooperationContractSaved.MoneyIncentivesRules {
+						moneyIncentivesRuleChanged = moneyIncentivesRuleChanged + moneyIncentivesRule.MoneyIncentivesStageCN +
+							"：" +
+							"，" + moneyIncentivesRule.MoneyIncentivesStageStart.Format("2006-01-02") +
+							"，" + fmt.Sprint(moneyIncentivesRule.ReferrerPercentage) +
+							"，" + fmt.Sprint(moneyIncentivesRule.SalesmanPercentage) + ";"
+					}
+					moneyIncentivesRuleChangedTmp := "【" + moneyIncentivesRuleChanged + "】"
+
+					// 拼接规则变更
+					incentivesRuleChangeDetail = moneyIncentivesRuleOriginalTmp + " 变更为 " + moneyIncentivesRuleChangedTmp
+				}
+			}
 		}
+		// 【1（张三，李四，王五）2（买买买，，）】变更为【1（张三，，）】
+		var undertakerChange string
+		if !cooperationContract.UndertakerSliceEqualBCE(cooperationContractFound.Undertakers, cooperationContractSaved.Undertakers) { // 3.承接人变更
+			// 原承接人
+			var undertakersOriginal string
+			for i, undertaker := range cooperationContractFound.Undertakers {
+				undertakersOriginal = undertakersOriginal + strconv.FormatInt(int64(i), 10) + "（" + undertaker.UserName + "，" + undertaker.Referrer.UserName + "," + undertaker.Salesman.UserName + "）"
+			}
+			undertakerChangeTmp1 := "【" + undertakersOriginal + "】"
+			// 变更承接人
+			var undertakersChanged string
+			for i, undertaker := range cooperationContractSaved.Undertakers {
+				undertakersChanged = undertakersChanged + strconv.FormatInt(int64(i), 10) + "（" + undertaker.UserName + "，" + undertaker.Referrer.UserName + "," + undertaker.Salesman.UserName + "）"
+			}
+			undertakerChangeTemp2 := "【" + undertakersChanged + "】"
+			// 拼接承接人变更记录
+			undertakerChange = undertakerChangeTmp1 + " 变更为 " + undertakerChangeTemp2
+		}
+
+		// 新增共创合约变更记录
 		newCooperationContractChangeLog := &domain.CooperationContractChangeLog{
-			IncentivesRule:            incentivesRule,
-			IncentivesRuleDetail:      incentivesRuleDetail,
-			OperationType:             0,
-			Undertakers:               "",
+			IncentivesRule:            incentivesRuleChange,
+			IncentivesRuleDetail:      incentivesRuleChangeDetail,
+			OperationType:             domain.EDIT,
+			Undertakers:               undertakerChange,
 			CooperationContractNumber: cooperationContractSaved.CooperationContractNumber,
 			Company:                   company,
-			Operator:                  nil,
+			Operator:                  operator,
 			UpdatedAt:                 time.Time{},
 			CreatedAt:                 time.Now(),
 		}
+
+		// 保存共创合约变更记录
 		if _, err20 := cooperationContractChangeLogRepository.Save(newCooperationContractChangeLog); err20 != nil {
 			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err20.Error())
 		}
--- a/pkg/application/dividendsReturnedOrder/command/create_dividends_returned_order.go
查看文件 @c5ba65e
+++ b/pkg/application/dividendsReturnedOrder/command/create_dividends_returned_order.go
查看文件 @c5ba65e
@@ -5,6 +5,7 @@ import (
 	"github.com/beego/beego/v2/core/validation"
 	"reflect"
 	"strings"
+	"time"
 )
 type OrderGoods struct {
@@ -36,7 +37,7 @@ type CreateDividendsReturnedOrderCommand struct {
 	// 备注
 	Remarks string `cname:"备注" json:"remarks" valid:"Required"`
 	// 退货日期
-	DividendsReturnedDate string `cname:"退货日期" json:"dividendsReturnedDate" valid:"Required"`
+	DividendsReturnedDate time.Time `cname:"退货日期" json:"dividendsReturnedDate" valid:"Required"`
 	// 退货区域名称
 	RegionName string `cname:"退货区域名称" json:"regionName,omitempty"`
 	// 订单产品列表
--- a/pkg/application/dividendsReturnedOrder/service/dividends_returned_order.go
查看文件 @c5ba65e
+++ b/pkg/application/dividendsReturnedOrder/service/dividends_returned_order.go
查看文件 @c5ba65e
@@ -135,7 +135,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) CreateDivide
 		OriginalOrderNum:              createDividendsReturnedOrderCommand.OriginalOrderNum,
 		DividendsOrderNumber:          createDividendsReturnedOrderCommand.DividendsOrderNumber,
 		DividendsReturnedCustomerName: createDividendsReturnedOrderCommand.DividendsReturnedCustomerName,
-		DividendsReturnedDate:         time.Time{},
+		DividendsReturnedDate:         createDividendsReturnedOrderCommand.DividendsReturnedDate,
 		Region: &domain.RegionInfo{
 			RegionNumber: "",
 			RegionName:   createDividendsReturnedOrderCommand.RegionName,
@@ -147,7 +147,6 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) CreateDivide
 		Org:            organization,
 		Company:        company,
 		CreatedAt:      time.Now(),
-		DeletedAt:      time.Time{},
 		UpdatedAt:      time.Time{},
 		Operator:       operator,
 		OperateTime:    time.Now(),
--- a/pkg/domain/cooperation_contract.go
查看文件 @c5ba65e
+++ b/pkg/domain/cooperation_contract.go
查看文件 @c5ba65e
@@ -9,6 +9,28 @@ const (
 	TYPE_MONEY_INCENTIVES
 )
+type IncentivesType int32
+
+const (
+	DividendsIncentives IncentivesType = 1
+	MoneyIncentives     IncentivesType = 2
+)
+
+func (p IncentivesType) String() string {
+	switch p {
+	case DividendsIncentives:
+		return "业绩分红"
+	case MoneyIncentives:
+		return "金额激励"
+	default:
+		return "未知类型"
+	}
+}
+
+func (cooperationContract *CooperationContract) ReturnIncentivesName(p IncentivesType) string {
+	return p.String()
+}
+
 // CooperationContract 共创项目合约实体
 type CooperationContract struct {
 	// 共创合约ID
@@ -101,3 +123,54 @@ func (cooperationContract *CooperationContract) Update(data map[string]interface
 	}
 	return nil
 }
+
+// UndertakerSliceEqualBCE 判断承接人Slice是否一样
+func (cooperationContract *CooperationContract) UndertakerSliceEqualBCE(a, b []*Undertaker) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	if (a == nil) != (b == nil) {
+		return false
+	}
+	b = b[:len(a)]
+	for i, v := range a {
+		if v != b[i] {
+			return false
+		}
+	}
+	return true
+}
+
+// DividendsIncentivesRuleSliceEqualBCE 判断业绩分红激励规则Slice是否一样
+func (cooperationContract *CooperationContract) DividendsIncentivesRuleSliceEqualBCE(a, b []*DividendsIncentivesRule) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	if (a == nil) != (b == nil) {
+		return false
+	}
+	b = b[:len(a)]
+	for i, v := range a {
+		if v != b[i] {
+			return false
+		}
+	}
+	return true
+}
+
+// MoneyIncentivesRuleSliceEqualBCE 判断金额激励规则Slice是否一样
+func (cooperationContract *CooperationContract) MoneyIncentivesRuleSliceEqualBCE(a, b []*MoneyIncentivesRule) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	if (a == nil) != (b == nil) {
+		return false
+	}
+	b = b[:len(a)]
+	for i, v := range a {
+		if v != b[i] {
+			return false
+		}
+	}
+	return true
+}
--- a/pkg/domain/cooperation_contract_change_log.go
查看文件 @c5ba65e
+++ b/pkg/domain/cooperation_contract_change_log.go
查看文件 @c5ba65e
@@ -2,6 +2,12 @@ package domain
 import "time"
+const (
+	EDIT    = iota + 1 // 编辑
+	PAUSE              // 暂停
+	RECOVER            // 恢复
+)
+
 // CooperationContractChangeLog 共创合约变更日志
 type CooperationContractChangeLog struct {
 	// 共创合约变更日志
@@ -20,6 +26,8 @@ type CooperationContractChangeLog struct {
 	Company *Company `json:"company"`
 	// 操作人
 	Operator *User `json:"operator"`
+	// 操作时间
+	OperatorTime time.Time `json:"operatorTime"`
 	// 更新时间
 	UpdatedAt time.Time `json:"updatedAt"`
 	// 删除时间
@@ -58,56 +66,5 @@ func (cooperationContractChangeLog *CooperationContractChangeLog) Update(data ma
 	if undertakers, ok := data["undertakers"]; ok {
 		cooperationContractChangeLog.Undertakers = undertakers.(string)
 	}
-	if companyId, ok := data["companyId"]; ok {
-		cooperationContractChangeLog.Company.CompanyId = companyId.(int64)
-	}
-	if companyLogo, ok := data["companyLogo"]; ok {
-		cooperationContractChangeLog.Company.CompanyLogo = companyLogo.(string)
-	}
-	if companyName, ok := data["companyName"]; ok {
-		cooperationContractChangeLog.Company.CompanyName = companyName.(string)
-	}
-	if userId, ok := data["userId"]; ok {
-		cooperationContractChangeLog.Operator.UserId = userId.(int64)
-	}
-	if userBaseId, ok := data["userBaseId"]; ok {
-		cooperationContractChangeLog.Operator.UserBaseId = userBaseId.(int64)
-	}
-	if orgId, ok := data["orgId"]; ok {
-		cooperationContractChangeLog.Operator.Org.OrgId = orgId.(int64)
-	}
-	if orgName, ok := data["orgName"]; ok {
-		cooperationContractChangeLog.Operator.Org.OrgName = orgName.(string)
-	}
-	if departmentId, ok := data["departmentId"]; ok {
-		cooperationContractChangeLog.Operator.Department.DepartmentId = departmentId.(int64)
-	}
-	if departmentName, ok := data["departmentName"]; ok {
-		cooperationContractChangeLog.Operator.Department.DepartmentName = departmentName.(string)
-	}
-	if departmentNumber, ok := data["departmentNumber"]; ok {
-		cooperationContractChangeLog.Operator.Department.DepartmentNumber = departmentNumber.(string)
-	}
-	if userAvatar, ok := data["userAvatar"]; ok {
-		cooperationContractChangeLog.Operator.UserInfo.UserAvatar = userAvatar.(string)
-	}
-	if userEmail, ok := data["userEmail"]; ok {
-		cooperationContractChangeLog.Operator.UserInfo.UserEmail = userEmail.(string)
-	}
-	if userName, ok := data["userName"]; ok {
-		cooperationContractChangeLog.Operator.UserInfo.UserName = userName.(string)
-	}
-	if userPhone, ok := data["userPhone"]; ok {
-		cooperationContractChangeLog.Operator.UserInfo.UserPhone = userPhone.(string)
-	}
-	if userAccount, ok := data["userAccount"]; ok {
-		cooperationContractChangeLog.Operator.UserInfo.UserAccount = userAccount.(string)
-	}
-	if userType, ok := data["userType"]; ok {
-		cooperationContractChangeLog.Operator.UserType = userType.(int32)
-	}
-	if status, ok := data["status"]; ok {
-		cooperationContractChangeLog.Operator.Status = status.(int32)
-	}
 	return nil
 }
--- a/pkg/infrastructure/pg/models/cooperation_contract_change_log.go
查看文件 @c5ba65e
+++ b/pkg/infrastructure/pg/models/cooperation_contract_change_log.go
查看文件 @c5ba65e
@@ -23,6 +23,8 @@ type CooperationContractChangeLog struct {
 	Company *domain.Company `comment:"公司"`
 	// 操作人
 	Operator *domain.User `comment:"操作人"`
+	// 操作时间
+	OperatorTime time.Time `comment:"操作时间"`
 	// 更新时间
 	UpdatedAt time.Time `comment:"更新时间"`
 	// 删除时间
--- a/pkg/infrastructure/repository/pg_cooperation_contract_change_log_repository.go
查看文件 @c5ba65e
+++ b/pkg/infrastructure/repository/pg_cooperation_contract_change_log_repository.go
查看文件 @c5ba65e
@@ -34,6 +34,7 @@ func (repository *CooperationContractChangeLogRepository) Save(cooperationContra
 		"undertakers",
 		"company",
 		"operator",
+		"operator_time",
 		"updated_at",
 		"deleted_at",
 		"created_at",
@@ -60,6 +61,7 @@ func (repository *CooperationContractChangeLogRepository) Save(cooperationContra
 				&cooperationContractChangeLog.Undertakers,
 				&cooperationContractChangeLog.Company,
 				&cooperationContractChangeLog.Operator,
+				&cooperationContractChangeLog.OperatorTime,
 				&cooperationContractChangeLog.UpdatedAt,
 				&cooperationContractChangeLog.DeletedAt,
 				&cooperationContractChangeLog.CreatedAt,
@@ -72,6 +74,7 @@ func (repository *CooperationContractChangeLogRepository) Save(cooperationContra
 			cooperationContractChangeLog.Undertakers,
 			cooperationContractChangeLog.Company,
 			cooperationContractChangeLog.Operator,
+			cooperationContractChangeLog.OperatorTime,
 			cooperationContractChangeLog.UpdatedAt,
 			nil,
 			cooperationContractChangeLog.CreatedAt,
@@ -88,6 +91,7 @@ func (repository *CooperationContractChangeLogRepository) Save(cooperationContra
 				&cooperationContractChangeLog.Undertakers,
 				&cooperationContractChangeLog.Company,
 				&cooperationContractChangeLog.Operator,
+				&cooperationContractChangeLog.OperatorTime,
 				&cooperationContractChangeLog.UpdatedAt,
 				&cooperationContractChangeLog.DeletedAt,
 				&cooperationContractChangeLog.CreatedAt,
@@ -100,6 +104,7 @@ func (repository *CooperationContractChangeLogRepository) Save(cooperationContra
 			cooperationContractChangeLog.Undertakers,
 			cooperationContractChangeLog.Company,
 			cooperationContractChangeLog.Operator,
+			cooperationContractChangeLog.OperatorTime,
 			cooperationContractChangeLog.UpdatedAt,
 			nil,
 			cooperationContractChangeLog.CreatedAt,