切换导航条
此项目
正在载入...
登录
allied-creation
/
allied-creation-cooperation
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
陈志颖
3 years ago
提交
b09d03ecffa4f5751f5d01de7d277e42a8038229
1 个父辈
67c87811
fix:取消分红预算单调整
显示空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
19 行增加
和
3 行删除
pkg/application/dividendsOrder/service/dividends_order.go
pkg/infrastructure/pg/models/dividends_estimate.go
pkg/infrastructure/repository/pg_dividends_estimate_repository.go
pkg/infrastructure/service_gateway/httplib_service_gateway.go
pkg/application/dividendsOrder/service/dividends_order.go
查看文件 @
b09d03e
...
...
@@ -145,6 +145,10 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD
}
}
log
.
Logger
.
Info
(
"查询到的合约"
,
map
[
string
]
interface
{}{
"cooperationContractsMap"
:
cooperationContractsMap
,
})
// 订单时间转换
orderTimeInt
,
err
:=
strconv
.
ParseInt
(
createDividendsOrderCommand
.
OrderTime
,
10
,
64
)
if
err
!=
nil
{
...
...
@@ -163,9 +167,14 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD
ruleMatchedFlag
:=
false
if
orderGood
.
CooperationContractNumber
!=
""
{
// 校验共创合约激励类型是否正确
if
cooperationContractsMap
[
orderGood
.
CooperationContractNumber
]
!=
nil
&&
cooperationContractsMap
[
orderGood
.
CooperationContractNumber
]
.
IncentivesType
!=
1
{
if
cooperationContractsMap
[
orderGood
.
CooperationContractNumber
]
!=
nil
{
if
cooperationContractsMap
[
orderGood
.
CooperationContractNumber
]
.
IncentivesType
!=
1
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"分红订单产品不能关联金额激励规则"
)
}
}
else
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"共创合约不存在"
)
}
// 校验产品关联合约的激励规则是否匹配订单时间
if
cooperationContractsMap
[
orderGood
.
CooperationContractNumber
]
!=
nil
{
for
_
,
incentivesRule
:=
range
cooperationContractsMap
[
orderGood
.
CooperationContractNumber
]
.
DividendsIncentivesRules
{
...
...
pkg/infrastructure/pg/models/dividends_estimate.go
查看文件 @
b09d03e
...
...
@@ -44,7 +44,7 @@ type DividendsEstimate struct {
// 操作时间
OperateTime
time
.
Time
`comment:"操作时间"`
// 取消状态
IsCanceled
bool
`comment:"取消状态" pg:",use_zero
,default:false
"`
IsCanceled
bool
`comment:"取消状态" pg:",use_zero"`
// 产品ID
OrderGoodId
int64
`comment:"产品ID"`
// 创建时间
...
...
pkg/infrastructure/repository/pg_dividends_estimate_repository.go
查看文件 @
b09d03e
...
...
@@ -48,6 +48,7 @@ func (repository *DividendsEstimateRepository) Save(dividendsEstimate *domain.Di
"created_at"
,
"deleted_at"
,
"updated_at"
,
"cooperation_contract_undertaker_id"
,
}
insertFieldsSnippet
:=
sqlbuilder
.
SqlFieldsSnippet
(
sqlBuildFields
)
insertPlaceHoldersSnippet
:=
sqlbuilder
.
SqlPlaceHoldersSnippet
(
sqlBuildFields
)
...
...
@@ -86,6 +87,7 @@ func (repository *DividendsEstimateRepository) Save(dividendsEstimate *domain.Di
&
dividendsEstimate
.
CreatedAt
,
&
dividendsEstimate
.
DeletedAt
,
&
dividendsEstimate
.
UpdatedAt
,
&
dividendsEstimate
.
CooperationContractUndertakerId
,
),
fmt
.
Sprintf
(
"INSERT INTO dividends_estimates (%s) VALUES (%s) RETURNING %s"
,
insertFieldsSnippet
,
insertPlaceHoldersSnippet
,
returningFieldsSnippet
),
dividendsEstimate
.
DividendsEstimateId
,
...
...
@@ -110,6 +112,7 @@ func (repository *DividendsEstimateRepository) Save(dividendsEstimate *domain.Di
dividendsEstimate
.
CreatedAt
,
nil
,
dividendsEstimate
.
UpdatedAt
,
dividendsEstimate
.
CooperationContractUndertakerId
,
);
err
!=
nil
{
return
dividendsEstimate
,
err
}
...
...
@@ -138,6 +141,7 @@ func (repository *DividendsEstimateRepository) Save(dividendsEstimate *domain.Di
&
dividendsEstimate
.
CreatedAt
,
&
dividendsEstimate
.
DeletedAt
,
&
dividendsEstimate
.
UpdatedAt
,
&
dividendsEstimate
.
CooperationContractUndertakerId
,
),
fmt
.
Sprintf
(
"UPDATE dividends_estimates SET %s WHERE dividends_estimate_id=? RETURNING %s"
,
updateFieldsSnippet
,
returningFieldsSnippet
),
dividendsEstimate
.
DividendsEstimateId
,
...
...
@@ -162,6 +166,7 @@ func (repository *DividendsEstimateRepository) Save(dividendsEstimate *domain.Di
dividendsEstimate
.
CreatedAt
,
nil
,
dividendsEstimate
.
UpdatedAt
,
dividendsEstimate
.
CooperationContractUndertakerId
,
dividendsEstimate
.
Identify
(),
);
err
!=
nil
{
return
dividendsEstimate
,
err
...
...
@@ -205,6 +210,7 @@ func (repository *DividendsEstimateRepository) SaveMany(dividendsEstimates []*do
CreatedAt
:
dividendsEstimate
.
CreatedAt
,
DeletedAt
:
dividendsEstimate
.
DeletedAt
,
UpdatedAt
:
dividendsEstimate
.
UpdatedAt
,
CooperationContractUndertakerId
:
dividendsEstimate
.
CooperationContractUndertakerId
,
})
}
if
len
(
dividendsEstimateModels
)
>
0
{
...
...
@@ -251,6 +257,7 @@ func (repository *DividendsEstimateRepository) UpdateMany(dividendsEstimates []*
CreatedAt
:
dividendsEstimate
.
CreatedAt
,
DeletedAt
:
dividendsEstimate
.
DeletedAt
,
UpdatedAt
:
time
.
Now
(),
CooperationContractUndertakerId
:
dividendsEstimate
.
CooperationContractUndertakerId
,
})
}
if
_
,
err
:=
tx
.
Model
(
&
dividendsEstimateModels
)
.
WherePK
()
.
Update
();
err
!=
nil
{
...
...
pkg/infrastructure/service_gateway/httplib_service_gateway.go
查看文件 @
b09d03e
...
...
@@ -45,7 +45,7 @@ func (serviceGateway *httplibBaseServiceGateway) createRequest(url string, metho
case
"head"
:
request
=
httplib
.
Head
(
url
)
break
default
:
:
request
=
httplib
.
Get
(
url
)
}
return
request
.
SetTimeout
(
serviceGateway
.
connectTimeout
,
serviceGateway
.
readWriteTimeout
)
...
...
请
注册
或
登录
后发表评论