切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
唐旭辉
5 years ago
提交
73bc49ef9d7df4f0c5a6b0608ef2a9a7e61a7366
1 个父辈
f47ba61f
更新
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
16 行增加
和
7 行删除
pkg/domain/business_bonus.go
pkg/infrastructure/dao/pg_business_bonus.go
pkg/port/beego/controllers/business_bonus_controller.go
pkg/domain/business_bonus.go
查看文件 @
73bc49e
...
...
@@ -2,10 +2,10 @@ package domain
import
"time"
// 业务分红信息 是否
关闭【0;否】【1:是
】
// 业务分红信息 是否
有效【0;无效】【1:有效
】
const
(
BUSINESS_BONUS_ENABLE
int8
=
0
BUSINESS_BONUS_DISABLE
int8
=
1
BUSINESS_BONUS_ENABLE
int8
=
1
BUSINESS_BONUS_DISABLE
int8
=
0
)
// 分红状态 1:待支付分红 2:已支付分红
...
...
pkg/infrastructure/dao/pg_business_bonus.go
查看文件 @
73bc49e
...
...
@@ -5,6 +5,7 @@ import (
"strings"
"time"
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain"
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg/transaction"
)
...
...
@@ -40,9 +41,9 @@ 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.is_disable=
0
AND business_bonus.company_id = ? `
WHERE business_bonus.is_disable=
?
AND business_bonus.company_id = ? `
partnerCondition
:=
[]
string
{}
allParam
:=
[]
interface
{}{
companyId
}
allParam
:=
[]
interface
{}{
domain
.
BUSINESS_BONUS_ENABLE
,
companyId
}
if
partnerId
>
0
{
partnerCondition
=
append
(
partnerCondition
,
` business_bonus.partner_info_id=? `
)
allParam
=
append
(
allParam
,
partnerId
)
...
...
@@ -70,9 +71,9 @@ func (dao BusinessBonusDao) CountBusinessBonus(partnerId int64, partnerNameMatch
sql
:=
`SELECT count(*)
FROM business_bonus
JOIN partner_info ON business_bonus.partner_info_id=partner_info.id
WHERE business_bonus.is_disable=
0
AND business_bonus.company_id = ? `
WHERE business_bonus.is_disable=
?
AND business_bonus.company_id = ? `
partnerCondition
:=
[]
string
{}
allParam
:=
[]
interface
{}{
companyId
}
allParam
:=
[]
interface
{}{
domain
.
BUSINESS_BONUS_ENABLE
,
companyId
}
if
partnerId
>
0
{
partnerCondition
=
append
(
partnerCondition
,
` business_bonus.partner_info_id=? `
)
allParam
=
append
(
allParam
,
partnerId
)
...
...
pkg/port/beego/controllers/business_bonus_controller.go
查看文件 @
73bc49e
...
...
@@ -40,10 +40,18 @@ func (c *BusinessBonusController) ListBusinessBonus() {
c
.
ResponseError
(
errors
.
New
(
"json数据解析失败"
))
return
}
if
param
.
PageSize
==
0
{
param
.
PageSize
=
20
}
if
param
.
PageNumber
==
0
{
param
.
PageNumber
=
1
}
companyId
:=
c
.
GetUserCompany
()
srv
:=
businessService
.
NewBusinessBonusService
(
nil
)
cnt
,
result
,
err
:=
srv
.
ListBusinessBonus
(
businessQuery
.
ListBusinessBonusQuery
{
CompanyId
:
companyId
,
Limit
:
param
.
PageSize
,
Offset
:
param
.
PageSize
*
(
param
.
PageNumber
-
1
),
})
if
err
!=
nil
{
c
.
ResponseError
(
err
)
...
...
请
注册
或
登录
后发表评论