切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
唐旭辉
5 years ago
提交
5ad3faa0d0079fa4d79fae65fbabc9ad19f223f3
1 个父辈
45c6f70c
bug 修复
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
6 行增加
和
2 行删除
pkg/application/partnerInfo/service/partner_info.go
pkg/domain/business_bonus.go
pkg/infrastructure/dao/pg_partner_info_dao.go
pkg/application/partnerInfo/service/partner_info.go
查看文件 @
5ad3faa
...
...
@@ -45,7 +45,7 @@ func (PartnerInfoService *PartnerInfoService) CreatePartnerInfo(cmd *command.Cre
});
err
!=
nil
{
return
nil
,
lib
.
ThrowError
(
lib
.
TRANSACTION_ERROR
,
err
.
Error
())
}
ok
,
err
:=
partnerinfoDao
.
PartnerAccountExist
(
cmd
.
Account
)
ok
,
err
:=
partnerinfoDao
.
PartnerAccountExist
(
cmd
.
Account
,
cmd
.
CompanyId
)
if
err
!=
nil
{
return
nil
,
lib
.
ThrowError
(
lib
.
TRANSACTION_ERROR
,
err
.
Error
())
}
...
...
pkg/domain/business_bonus.go
查看文件 @
5ad3faa
...
...
@@ -93,6 +93,7 @@ func (pay BusinessBonusNullPay) NullPayPartnerBonus(bonus *BusinessBonus) error
func
(
pay
BusinessBonusNullPay
)
WartPayPartnerBonus
(
bonus
*
BusinessBonus
)
error
{
bonus
.
BonusNot
=
bonus
.
Bonus
bonus
.
BonusStatus
=
BUSINESS_BONUS_WAIT_PAY
bonus
.
BonusHas
=
0
return
nil
}
...
...
@@ -115,6 +116,7 @@ func (pay BusinessBonusWaitPay) NullPayPartnerBonus(bonus *BusinessBonus) error
func
(
pay
BusinessBonusWaitPay
)
WartPayPartnerBonus
(
bonus
*
BusinessBonus
)
error
{
bonus
.
BonusNot
=
bonus
.
Bonus
bonus
.
BonusStatus
=
BUSINESS_BONUS_WAIT_PAY
bonus
.
BonusHas
=
0
return
nil
}
...
...
@@ -137,6 +139,7 @@ func (pay BusinessBonusHasPay) NullPayPartnerBonus(bonus *BusinessBonus) error {
func
(
pay
BusinessBonusHasPay
)
WartPayPartnerBonus
(
bonus
*
BusinessBonus
)
error
{
bonus
.
BonusNot
=
bonus
.
Bonus
bonus
.
BonusStatus
=
BUSINESS_BONUS_WAIT_PAY
bonus
.
BonusHas
=
0
return
nil
}
...
...
pkg/infrastructure/dao/pg_partner_info_dao.go
查看文件 @
5ad3faa
...
...
@@ -21,11 +21,12 @@ func NewPartnerInfoDao(transactionContext *transaction.TransactionContext) (*Par
}
}
func
(
dao
PartnerInfoDao
)
PartnerAccountExist
(
account
string
)
(
bool
,
error
)
{
func
(
dao
PartnerInfoDao
)
PartnerAccountExist
(
account
string
,
companyId
int64
)
(
bool
,
error
)
{
tx
:=
dao
.
transactionContext
.
PgDd
m
:=
&
models
.
PartnerInfo
{}
ok
,
err
:=
tx
.
Model
(
m
)
.
Where
(
"account=?"
,
account
)
.
Where
(
"company_id=?"
,
companyId
)
.
Exists
()
return
ok
,
err
...
...
请
注册
或
登录
后发表评论