切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
唐旭辉
5 years ago
提交
cf55b4706911381e2ff8cc4522d73012b2a7e72f
1 个父辈
b00ad6cd
错误修复
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
36 行增加
和
4 行删除
pkg/application/businessBonus/service/service.go
pkg/infrastructure/dao/pg_business_bonus.go
pkg/port/beego/controllers/business_bonus_controller.go
pkg/application/businessBonus/service/service.go
查看文件 @
cf55b47
...
...
@@ -44,6 +44,11 @@ func (srv BusinessBonusService) ListBusinessBonus(queryOption query.ListBusiness
if
err
!=
nil
{
return
0
,
nil
,
err
}
cnt
,
err
:=
bonusDaoao
.
CountBusinessBonus
(
queryOption
.
PartnerId
,
queryOption
.
PartnerNameMatch
,
queryOption
.
CompanyId
,
queryOption
.
Limit
,
queryOption
.
Offset
)
if
err
!=
nil
{
return
0
,
nil
,
err
}
err
=
transactionContext
.
CommitTransaction
()
returnData
:=
[]
map
[
string
]
interface
{}{}
...
...
@@ -60,7 +65,7 @@ func (srv BusinessBonusService) ListBusinessBonus(queryOption query.ListBusiness
}
returnData
=
append
(
returnData
,
m
)
}
return
0
,
returnData
,
nil
return
cnt
,
returnData
,
nil
}
func
(
srv
BusinessBonusService
)
UpdateBusinessBonus
(
cmd
command
.
UpdateBusinessBonusCommand
)
error
{
...
...
pkg/infrastructure/dao/pg_business_bonus.go
查看文件 @
cf55b47
...
...
@@ -40,7 +40,7 @@ func (dao BusinessBonusDao) SearchBusinessBonus(partnerId int64, partnerNameMatc
,partner_info.partner_name,business_bonus.bonus_has
FROM business_bonus
JOIN partner_info ON business_bonus.partner_info_id=partner_info.id
WHERE business_bonus.company_id = ? `
WHERE business_bonus.
is_disable=0 AND business_bonus.
company_id = ? `
partnerCondition
:=
[]
string
{}
allParam
:=
[]
interface
{}{
companyId
}
if
partnerId
>
0
{
...
...
@@ -64,3 +64,30 @@ func (dao BusinessBonusDao) SearchBusinessBonus(partnerId int64, partnerNameMatc
_
,
err
=
tx
.
Query
(
&
result
,
sql
,
allParam
...
)
return
result
,
err
}
func
(
dao
BusinessBonusDao
)
CountBusinessBonus
(
partnerId
int64
,
partnerNameMatch
string
,
companyId
int64
,
limit
int
,
offset
int
)
(
int
,
error
)
{
sql
:=
`SELECT count(*)
JOIN partner_info ON business_bonus.partner_info_id=partner_info.id
WHERE business_bonus.is_disable=0 AND business_bonus.company_id = ? `
partnerCondition
:=
[]
string
{}
allParam
:=
[]
interface
{}{
companyId
}
if
partnerId
>
0
{
partnerCondition
=
append
(
partnerCondition
,
` business_bonus.partner_info_id=? `
)
allParam
=
append
(
allParam
,
partnerId
)
}
if
len
(
partnerNameMatch
)
>
0
{
allParam
=
append
(
allParam
,
"%"
+
partnerNameMatch
+
"%"
)
partnerCondition
=
append
(
partnerCondition
,
` partner_info.partner_name like ? `
)
}
if
len
(
partnerCondition
)
>
0
{
sql
+=
fmt
.
Sprintf
(
" AND (%s)"
,
strings
.
Join
(
partnerCondition
,
" OR "
))
}
tx
:=
dao
.
transactionContext
.
PgTx
var
(
result
int
err
error
)
_
,
err
=
tx
.
Query
(
&
result
,
sql
,
allParam
...
)
return
result
,
err
}
...
...
pkg/port/beego/controllers/business_bonus_controller.go
查看文件 @
cf55b47
...
...
@@ -42,14 +42,14 @@ func (c *BusinessBonusController) ListBusinessBonus() {
}
companyId
:=
c
.
GetUserCompany
()
srv
:=
businessService
.
NewBusinessBonusService
(
nil
)
_
,
result
,
err
:=
srv
.
ListBusinessBonus
(
businessQuery
.
ListBusinessBonusQuery
{
cnt
,
result
,
err
:=
srv
.
ListBusinessBonus
(
businessQuery
.
ListBusinessBonusQuery
{
CompanyId
:
companyId
,
})
if
err
!=
nil
{
c
.
ResponseError
(
err
)
return
}
c
.
ResponsePageList
(
result
,
0
,
param
.
PageNumber
)
c
.
ResponsePageList
(
result
,
cnt
,
param
.
PageNumber
)
}
func
(
c
*
BusinessBonusController
)
UpdateBusinessBonus
()
{
...
...
请
注册
或
登录
后发表评论