|
...
|
...
|
@@ -3,11 +3,8 @@ package service |
|
|
|
import (
|
|
|
|
"crypto/md5"
|
|
|
|
"encoding/hex"
|
|
|
|
"encoding/json"
|
|
|
|
"fmt"
|
|
|
|
"strconv"
|
|
|
|
"time"
|
|
|
|
"unsafe"
|
|
|
|
|
|
|
|
"github.com/linmadan/egglib-go/core/application"
|
|
|
|
"github.com/linmadan/egglib-go/utils/tool_funs"
|
|
|
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/application/cooperationContract/command"
|
|
...
|
...
|
@@ -19,6 +16,8 @@ import ( |
|
|
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/dao"
|
|
|
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/utils"
|
|
|
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/log"
|
|
|
|
"strconv"
|
|
|
|
"time"
|
|
|
|
)
|
|
|
|
|
|
|
|
// CooperationContractService 共创合约服务
|
|
...
|
...
|
@@ -1270,18 +1269,33 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC |
|
|
|
} else if cooperationContractFound.IncentivesType == cooperationContract.IncentivesType { // 2.激励规则内容变更
|
|
|
|
if cooperationContractFound.IncentivesType == domain.TYPE_DIVIDNEDS_INCENTIVES { // 业绩分红规则内容变更
|
|
|
|
// 计算原合约哈希值
|
|
|
|
cooperationContractFoundByte := *(*[]byte)(unsafe.Pointer(&cooperationContractFound.DividendsIncentivesRules))
|
|
|
|
cooperationContractFoundHashValue := md5.Sum(cooperationContractFoundByte)
|
|
|
|
// cooperationContractFoundByte := *(*[]byte)(unsafe.Pointer(&cooperationContractFound.DividendsIncentivesRules))
|
|
|
|
var cooperationContractFoundBytes []byte
|
|
|
|
for _, rule := range cooperationContractFound.DividendsIncentivesRules {
|
|
|
|
jsons, errs := json.Marshal(rule)
|
|
|
|
if errs != nil {
|
|
|
|
fmt.Println(errs.Error())
|
|
|
|
}
|
|
|
|
cooperationContractFoundBytes = append(cooperationContractFoundBytes, jsons...)
|
|
|
|
}
|
|
|
|
cooperationContractFoundHashValue := md5.Sum(cooperationContractFoundBytes)
|
|
|
|
cooperationContractFoundHashString := hex.EncodeToString(cooperationContractFoundHashValue[:])
|
|
|
|
|
|
|
|
// 计算更新后的合约哈希值
|
|
|
|
cooperationContractByte := *(*[]byte)(unsafe.Pointer(&cooperationContract.DividendsIncentivesRules))
|
|
|
|
cooperationContractHashValue := md5.Sum(cooperationContractByte)
|
|
|
|
// cooperationContractByte := *(*[]byte)(unsafe.Pointer(&cooperationContract.DividendsIncentivesRules))
|
|
|
|
var cooperationContractBytes []byte
|
|
|
|
for _, rule := range cooperationContract.DividendsIncentivesRules {
|
|
|
|
jsons, errs := json.Marshal(rule)
|
|
|
|
if errs != nil {
|
|
|
|
fmt.Println(errs.Error())
|
|
|
|
}
|
|
|
|
cooperationContractBytes = append(cooperationContractBytes, jsons...)
|
|
|
|
}
|
|
|
|
cooperationContractHashValue := md5.Sum(cooperationContractBytes)
|
|
|
|
cooperationContractHashString := hex.EncodeToString(cooperationContractHashValue[:])
|
|
|
|
|
|
|
|
if cooperationContractFoundHashString != cooperationContractHashString {
|
|
|
|
// 业绩分红-->业绩分红
|
|
|
|
|
|
|
|
incentivesRuleChange = cooperationContract.ReturnIncentivesName(domain.IncentivesType(cooperationContractFound.IncentivesType)) + "-->" + cooperationContract.ReturnIncentivesName(domain.IncentivesType(cooperationContract.IncentivesType))
|
|
|
|
//【第一阶段：20，2021-01-01~2021-12-31，，，；第二阶段：20，2021-01-01~2021-12-31，30，10】变更为【第一阶段：20，2021-01-01~2021-12-31，，，；】
|
|
|
|
// 原业绩分红激励规则
|
|
...
|
...
|
@@ -1311,13 +1325,29 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC |
|
|
|
}
|
|
|
|
} else if cooperationContractFound.IncentivesType == domain.TYPE_MONEY_INCENTIVES { // 金额激励规则内容变更
|
|
|
|
// 计算原合约哈希值
|
|
|
|
cooperationContractFoundByte := *(*[]byte)(unsafe.Pointer(&cooperationContractFound.MoneyIncentivesRules))
|
|
|
|
cooperationContractFoundHashValue := md5.Sum(cooperationContractFoundByte)
|
|
|
|
//cooperationContractFoundByte := *(*[]byte)(unsafe.Pointer(&cooperationContractFound.MoneyIncentivesRules))
|
|
|
|
var cooperationContractFoundBytes []byte
|
|
|
|
for _, rule := range cooperationContractFound.MoneyIncentivesRules {
|
|
|
|
jsons, errs := json.Marshal(rule)
|
|
|
|
if errs != nil {
|
|
|
|
fmt.Println(errs.Error())
|
|
|
|
}
|
|
|
|
cooperationContractFoundBytes = append(cooperationContractFoundBytes, jsons...)
|
|
|
|
}
|
|
|
|
cooperationContractFoundHashValue := md5.Sum(cooperationContractFoundBytes)
|
|
|
|
cooperationContractFoundHashString := hex.EncodeToString(cooperationContractFoundHashValue[:])
|
|
|
|
|
|
|
|
// 计算更新后的合约哈希值
|
|
|
|
cooperationContractByte := *(*[]byte)(unsafe.Pointer(&cooperationContract.MoneyIncentivesRules))
|
|
|
|
cooperationContractHashValue := md5.Sum(cooperationContractByte)
|
|
|
|
//cooperationContractByte := *(*[]byte)(unsafe.Pointer(&cooperationContract.MoneyIncentivesRules))
|
|
|
|
var cooperationContractBytes []byte
|
|
|
|
for _, rule := range cooperationContract.MoneyIncentivesRules {
|
|
|
|
jsons, errs := json.Marshal(rule)
|
|
|
|
if errs != nil {
|
|
|
|
fmt.Println(errs.Error())
|
|
|
|
}
|
|
|
|
cooperationContractBytes = append(cooperationContractBytes, jsons...)
|
|
|
|
}
|
|
|
|
cooperationContractHashValue := md5.Sum(cooperationContractBytes)
|
|
|
|
cooperationContractHashString := hex.EncodeToString(cooperationContractHashValue[:])
|
|
|
|
|
|
|
|
if cooperationContractFoundHashString != cooperationContractHashString {
|
|
...
|
...
|
@@ -1351,13 +1381,28 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC |
|
|
|
|
|
|
|
/*********************************************** 承接人变更 *****************************************************/
|
|
|
|
// 计算原合约哈希值
|
|
|
|
cooperationContractFoundByte := *(*[]byte)(unsafe.Pointer(&cooperationContractFound.Undertakers))
|
|
|
|
cooperationContractFoundHashValue := md5.Sum(cooperationContractFoundByte)
|
|
|
|
//cooperationContractFoundByte := *(*[]byte)(unsafe.Pointer(&cooperationContractFound.Undertakers))
|
|
|
|
var cooperationContractFoundBytes []byte
|
|
|
|
for _, undertaker := range cooperationContractFound.Undertakers {
|
|
|
|
jsons, errs := json.Marshal(undertaker)
|
|
|
|
if errs != nil {
|
|
|
|
fmt.Println(errs.Error())
|
|
|
|
}
|
|
|
|
cooperationContractFoundBytes = append(cooperationContractFoundBytes, jsons...)
|
|
|
|
}
|
|
|
|
cooperationContractFoundHashValue := md5.Sum(cooperationContractFoundBytes)
|
|
|
|
cooperationContractFoundHashString := hex.EncodeToString(cooperationContractFoundHashValue[:])
|
|
|
|
|
|
|
|
// 计算更新后的合约哈希值
|
|
|
|
cooperationContractByte := *(*[]byte)(unsafe.Pointer(&cooperationContract.Undertakers))
|
|
|
|
cooperationContractHashValue := md5.Sum(cooperationContractByte)
|
|
|
|
var cooperationContractBytes []byte
|
|
|
|
for _, undertaker := range cooperationContract.Undertakers {
|
|
|
|
jsons, errs := json.Marshal(undertaker) //转换成JSON返回的是byte[]
|
|
|
|
if errs != nil {
|
|
|
|
fmt.Println(errs.Error())
|
|
|
|
}
|
|
|
|
cooperationContractBytes = append(cooperationContractBytes, jsons...)
|
|
|
|
}
|
|
|
|
cooperationContractHashValue := md5.Sum(cooperationContractBytes)
|
|
|
|
cooperationContractHashString := hex.EncodeToString(cooperationContractHashValue[:])
|
|
|
|
|
|
|
|
if cooperationContractFoundHashString != cooperationContractHashString { // 【1（张三，李四，王五）2（买买买，，）】变更为【1（张三，，）】
|
...
|
...
|
|
