切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
唐旭辉
4 years ago
提交
cb2f186fe626381fa5d9be194dae9cfb33f90987
1 个父辈
4eb0f252
无用功能代码注释,下版本彻底删除
隐藏空白字符变更
内嵌
并排对比
正在显示
8 个修改的文件
包含
176 行增加
和
141 行删除
pkg/application/businessBonus/service/service.go
pkg/application/factory/domain_service.go
pkg/application/partnerInfo/service/partner_info.go
pkg/domain/service/business_bonus.go
pkg/infrastructure/domainService/pg_business_bonus_service.go
pkg/port/beego/controllers/business_bonus_controller.go
pkg/port/beego/controllers/order_info_controlller.go
pkg/port/beego/controllers/partner_info_controller.go
pkg/application/businessBonus/service/service.go
查看文件 @
cb2f186
package
service
type
BusinessBonusService
struct
{
}
// type BusinessBonusService struct {
// }
func
NewBusinessBonusService
(
option
map
[
string
]
interface
{})
*
BusinessBonusService
{
newService
:=
new
(
BusinessBonusService
)
return
newService
}
// func NewBusinessBonusService(option map[string]interface{}) *BusinessBonusService {
// newService := new(BusinessBonusService)
// return newService
// }
// ListBusinessBonus 列表
// func (srv BusinessBonusService) ListBusinessBonus(queryOption query.ListBusinessBonusQuery) (int, interface{}, error) {
...
...
@@ -166,3 +166,4 @@ func NewBusinessBonusService(option map[string]interface{}) *BusinessBonusServic
// return returnData, nil
// }
// }
...
...
pkg/application/factory/domain_service.go
查看文件 @
cb2f186
...
...
@@ -6,13 +6,19 @@ import (
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg/transaction"
)
func
CreateBusinessBonusService
(
options
map
[
string
]
interface
{})
(
service
.
BusinessBonusService
,
error
)
{
var
transactionContext
*
transaction
.
TransactionContext
if
value
,
ok
:=
options
[
"transactionContext"
];
ok
{
transactionContext
=
value
.
(
*
transaction
.
TransactionContext
)
}
return
domainService
.
NewBusinessBonusService
(
transactionContext
),
nil
}
// func CreateBusinessBonusService(options map[string]interface{}) (service.BusinessBonusService, error) {
// var transactionContext *transaction.TransactionContext
// if value, ok := options["transactionContext"]; ok {
// transactionContext = value.(*transaction.TransactionContext)
// }
// return domainService.NewBusinessBonusService(transactionContext), nil
// }
// var transactionContext *transaction.TransactionContext
// if value, ok := options["transactionContext"]; ok {
// transactionContext = value.(*transaction.TransactionContext)
// }
// return domainService.NewBusinessBonusService(transactionContext), nil
// }
func
CreateOrderBonusService
(
options
map
[
string
]
interface
{})
(
service
.
OrderBonusService
,
error
)
{
var
transactionContext
*
transaction
.
TransactionContext
...
...
pkg/application/partnerInfo/service/partner_info.go
查看文件 @
cb2f186
...
...
@@ -8,7 +8,6 @@ import (
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/partnerInfo/command"
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/partnerInfo/query"
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain"
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain/service"
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/dao"
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/lib"
)
...
...
@@ -23,7 +22,7 @@ func NewPartnerInfoService(options map[string]interface{}) *PartnerInfoService {
}
// CreatePartnerInfo 创建合伙人
func
(
PartnerInfoService
*
PartnerInfoService
)
CreatePartnerInfo
(
cmd
*
command
.
CreatePartnerInfoCommand
)
(
data
interface
{}
,
err
error
)
{
func
(
PartnerInfoService
*
PartnerInfoService
)
CreatePartnerInfo
(
cmd
*
command
.
CreatePartnerInfoCommand
)
(
data
*
domain
.
PartnerInfo
,
err
error
)
{
var
(
transactionContext
,
_
=
factory
.
CreateTransactionContext
(
nil
)
)
...
...
@@ -92,19 +91,19 @@ func (PartnerInfoService *PartnerInfoService) CreatePartnerInfo(cmd *command.Cre
if
err
=
partnerInfoRepository
.
Save
(
&
newPartnerInfo
);
err
!=
nil
{
return
nil
,
lib
.
ThrowError
(
lib
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
var
businessBonusSrv
service
.
BusinessBonusService
if
businessBonusSrv
,
err
=
factory
.
CreateBusinessBonusService
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
});
err
!=
nil
{
return
nil
,
lib
.
ThrowError
(
lib
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
err
=
businessBonusSrv
.
EnableOrDisable
(
newPartnerInfo
.
Partner
.
Id
)
if
err
!=
nil
{
e
:=
fmt
.
Sprintf
(
"更新业务分红(partner_id=%d)数据失败:%s"
,
newPartnerInfo
.
Partner
.
Id
,
err
)
return
nil
,
lib
.
ThrowError
(
lib
.
INTERNAL_SERVER_ERROR
,
e
)
}
//var businessBonusSrv service.BusinessBonusService
// if businessBonusSrv, err = factory.CreateBusinessBonusService(map[string]interface{}{
// "transactionContext": transactionContext,
// }); err != nil {
// return nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error())
// }
// err = businessBonusSrv.EnableOrDisable(newPartnerInfo.Partner.Id)
// if err != nil {
// e := fmt.Sprintf("更新业务分红(partner_id=%d)数据失败:%s", newPartnerInfo.Partner.Id, err)
// return nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, e)
// }
err
=
transactionContext
.
CommitTransaction
()
return
newPartnerInfo
,
nil
return
&
newPartnerInfo
,
nil
}
// GetPartnerInfo 返回合伙人
...
...
@@ -216,18 +215,18 @@ func (PartnerInfoService *PartnerInfoService) UpdatePartnerInfo(cmd *command.Upd
if
err
=
partnerInfoRepository
.
Save
(
partnerInfo
);
err
!=
nil
{
return
lib
.
ThrowError
(
lib
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
var
businessBonusSrv
service
.
BusinessBonusService
if
businessBonusSrv
,
err
=
factory
.
CreateBusinessBonusService
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
});
err
!=
nil
{
return
lib
.
ThrowError
(
lib
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
//TODO 修改为本地消息订阅
err
=
businessBonusSrv
.
EnableOrDisable
(
partnerInfo
.
Partner
.
Id
)
if
err
!=
nil
{
e
:=
fmt
.
Sprintf
(
"更新业务分红(partner_id=%d)数据失败:%s"
,
partnerInfo
.
Partner
.
Id
,
err
)
return
lib
.
ThrowError
(
lib
.
INTERNAL_SERVER_ERROR
,
e
)
}
//到0.6.0 彻底删除
// var businessBonusSrv service.BusinessBonusService
// if businessBonusSrv, err = factory.CreateBusinessBonusService(map[string]interface{}{
// "transactionContext": transactionContext,
// }); err != nil {
// return lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error())
// }
// err = businessBonusSrv.EnableOrDisable(partnerInfo.Partner.Id)
// if err != nil {
// e := fmt.Sprintf("更新业务分红(partner_id=%d)数据失败:%s", partnerInfo.Partner.Id, err)
// return lib.ThrowError(lib.INTERNAL_SERVER_ERROR, e)
// }
transactionContext
.
CommitTransaction
()
return
}
...
...
pkg/domain/service/business_bonus.go
查看文件 @
cb2f186
package
service
type
BusinessBonusService
interface
{
EnableOrDisable
(
userid
int64
)
error
}
// type BusinessBonusService interface {
// EnableOrDisable(userid int64) error
// }
// EnableOrDisable(userid int64) error
// }
...
...
pkg/infrastructure/domainService/pg_business_bonus_service.go
查看文件 @
cb2f186
package
domainService
import
(
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain"
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/dao"
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg/transaction"
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/repository"
)
// type BusinessBonusService struct {
// transactionContext *transaction.TransactionContext
// }
type
BusinessBonusService
struct
{
transactionContext
*
transaction
.
TransactionContext
}
// func NewBusinessBonusService(tcx *transaction.TransactionContext) *BusinessBonusService {
// return &BusinessBonusService{
// transactionContext: tcx,
// }
// }
func
NewBusinessBonusService
(
tcx
*
transaction
.
TransactionContext
)
*
BusinessBonusService
{
return
&
BusinessBonusService
{
transactionContext
:
tcx
,
}
}
// func (srv BusinessBonusService) EnableOrDisable(parntnerId int64) error {
// var (
// bonusDao, _ = dao.NewBusinessBonusDao(srv.transactionContext)
// bonusReponsitory, _ = repository.NewBusinessBonusRepository(srv.transactionContext)
// partnerReponsitory, _ = repository.NewPartnerInfoRepository(srv.transactionContext)
func
(
srv
BusinessBonusService
)
EnableOrDisable
(
parntnerId
int64
)
error
{
var
(
bonusDao
,
_
=
dao
.
NewBusinessBonusDao
(
srv
.
transactionContext
)
bonusReponsitory
,
_
=
repository
.
NewBusinessBonusRepository
(
srv
.
transactionContext
)
partnerReponsitory
,
_
=
repository
.
NewPartnerInfoRepository
(
srv
.
transactionContext
)
// err error
// partnerHasInBonus bool
// partnerData *domain.PartnerInfo
// partnerHasBusinessCategory bool
// )
// partnerHasInBonus, err = bonusDao.ExistBusinessBonus(parntnerId)
// if err != nil {
// return err
// }
// partnerData, err = partnerReponsitory.FindOne(domain.PartnerFindOneQuery{UserId: parntnerId})
// if err != nil {
// return err
// }
// for _, v := range partnerData.PartnerCategoryInfos {
// if v.Id == 2 {
// partnerHasBusinessCategory = true
// break
// }
// }
// if partnerHasInBonus && partnerHasBusinessCategory {
// //已存在业务分红数据况 && 是业务合伙人类型
// var bonusData *domain.BusinessBonus
// bonusData, err = bonusReponsitory.FindOne(domain.BusinessBonusFindOneQuery{
// PartnerId: parntnerId,
// })
// if bonusData.IsDisable == domain.BUSINESS_BONUS_ENABLE {
// return nil
// }
// bonusData.IsDisable = domain.BUSINESS_BONUS_ENABLE
// err = bonusReponsitory.Edit(bonusData)
// return err
// }
// if partnerHasInBonus && !partnerHasBusinessCategory {
// //已存在业务分红数据况 && 不是业务合伙人类型
// var bonusData *domain.BusinessBonus
// bonusData, err = bonusReponsitory.FindOne(domain.BusinessBonusFindOneQuery{
// PartnerId: parntnerId,
// })
// if bonusData.IsDisable == domain.BUSINESS_BONUS_DISABLE {
// return nil
// }
// bonusData.IsDisable = domain.BUSINESS_BONUS_DISABLE
// err = bonusReponsitory.Edit(bonusData)
// return err
// }
err
error
partnerHasInBonus
bool
partnerData
*
domain
.
PartnerInfo
partnerHasBusinessCategory
bool
)
partnerHasInBonus
,
err
=
bonusDao
.
ExistBusinessBonus
(
parntnerId
)
if
err
!=
nil
{
return
err
}
partnerData
,
err
=
partnerReponsitory
.
FindOne
(
domain
.
PartnerFindOneQuery
{
UserId
:
parntnerId
})
if
err
!=
nil
{
return
err
}
for
_
,
v
:=
range
partnerData
.
PartnerCategoryInfos
{
if
v
.
Id
==
2
{
partnerHasBusinessCategory
=
true
break
}
}
if
partnerHasInBonus
&&
partnerHasBusinessCategory
{
//已存在业务分红数据况 && 是业务合伙人类型
var
bonusData
*
domain
.
BusinessBonus
bonusData
,
err
=
bonusReponsitory
.
FindOne
(
domain
.
BusinessBonusFindOneQuery
{
PartnerId
:
parntnerId
,
})
if
bonusData
.
IsDisable
==
domain
.
BUSINESS_BONUS_ENABLE
{
return
nil
}
bonusData
.
IsDisable
=
domain
.
BUSINESS_BONUS_ENABLE
err
=
bonusReponsitory
.
Edit
(
bonusData
)
return
err
}
if
partnerHasInBonus
&&
!
partnerHasBusinessCategory
{
//已存在业务分红数据况 && 不是业务合伙人类型
var
bonusData
*
domain
.
BusinessBonus
bonusData
,
err
=
bonusReponsitory
.
FindOne
(
domain
.
BusinessBonusFindOneQuery
{
PartnerId
:
parntnerId
,
})
if
bonusData
.
IsDisable
==
domain
.
BUSINESS_BONUS_DISABLE
{
return
nil
}
bonusData
.
IsDisable
=
domain
.
BUSINESS_BONUS_DISABLE
err
=
bonusReponsitory
.
Edit
(
bonusData
)
return
err
}
// if !partnerHasInBonus && partnerHasBusinessCategory {
// //不存在业务分红数据况 && 是业务合伙人类型
// newBonus := &domain.BusinessBonus{
// PartnerInfoId: partnerData.Partner.Id,
// IsDisable: domain.BUSINESS_BONUS_ENABLE,
// CompanyId: partnerData.CompanyId,
// Bonus: 0,
// }
// err = bonusReponsitory.Add(newBonus)
// return err
// }
if
!
partnerHasInBonus
&&
partnerHasBusinessCategory
{
//不存在业务分红数据况 && 是业务合伙人类型
newBonus
:=
&
domain
.
BusinessBonus
{
PartnerInfoId
:
partnerData
.
Partner
.
Id
,
IsDisable
:
domain
.
BUSINESS_BONUS_ENABLE
,
CompanyId
:
partnerData
.
CompanyId
,
Bonus
:
0
,
}
err
=
bonusReponsitory
.
Add
(
newBonus
)
return
err
}
return
nil
}
// return nil
// }
// }
...
...
pkg/port/beego/controllers/business_bonus_controller.go
查看文件 @
cb2f186
package
controllers
import
(
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain"
)
type
BusinessBonusController
struct
{
BaseController
}
// type BusinessBonusController struct {
// BaseController
// }
func
(
c
*
BusinessBonusController
)
Prepare
()
{
c
.
BaseController
.
Prepare
()
if
ok
:=
c
.
ValidJWTToken
();
!
ok
{
return
}
if
ok
:=
c
.
ValidAdminPermission
(
domain
.
PERMISSION_DIVIDEND
);
!
ok
{
return
}
}
// func (c *BusinessBonusController) Prepare() {
// c.BaseController.Prepare()
// if ok := c.ValidJWTToken(); !ok {
// return
// }
// if ok := c.ValidAdminPermission(domain.PERMISSION_DIVIDEND); !ok {
// return
// }
// }
// func (c *BusinessBonusController) ListBusinessBonus() {
// type Parameter struct {
...
...
@@ -110,3 +106,27 @@ func (c *BusinessBonusController) Prepare() {
// }
// c.ResponseData(data)
// }
// type Parameter struct {
// Id int64 `json:"id"`
// }
// var (
// param Parameter
// err error
// )
// if err = c.BindJsonData(¶m); err != nil {
// logs.Error(err)
// c.ResponseError(errors.New("json数据解析失败"))
// return
// }
// companyId := c.GetUserCompany()
// srv := businessService.NewBusinessBonusService(nil)
// data, err := srv.GetBusinessBonus(businessQuery.GetBusinessBonusQuery{
// Id: param.Id,
// CompanyId: companyId,
// })
// if err != nil {
// c.ResponseError(err)
// return
// }
// c.ResponseData(data)
// }
...
...
pkg/port/beego/controllers/order_info_controlller.go
查看文件 @
cb2f186
...
...
@@ -594,8 +594,9 @@ func (c *OrderInfoController) UpdateOrderReal() {
c
.
ResponseError
(
err
)
return
}
var
orderDataReturn
*
domain
.
OrderBase
if
param
.
Id
==
0
{
err
=
c
.
addOrderReal
(
param
)
orderDataReturn
,
err
=
c
.
addOrderReal
(
param
)
}
else
{
err
=
c
.
editOrderReal
(
param
)
}
...
...
@@ -603,11 +604,17 @@ func (c *OrderInfoController) UpdateOrderReal() {
c
.
ResponseError
(
err
)
return
}
if
orderDataReturn
!=
nil
{
c
.
ResponseData
(
map
[
string
]
interface
{}{
"id"
:
orderDataReturn
.
Id
,
})
return
}
c
.
ResponseData
(
nil
)
return
}
func
(
c
*
OrderInfoController
)
addOrderReal
(
param
postRealOrderDetail
)
error
{
func
(
c
*
OrderInfoController
)
addOrderReal
(
param
postRealOrderDetail
)
(
*
domain
.
OrderBase
,
error
)
{
orderSrv
:=
orderService
.
NewOrderInfoService
(
nil
)
newGoods
:=
[]
orderCmd
.
OrderGoodData
{}
for
_
,
v
:=
range
param
.
Product
{
...
...
@@ -632,8 +639,8 @@ func (c *OrderInfoController) addOrderReal(param postRealOrderDetail) error {
CompanyId
:
companyId
,
PartnerCategory
:
param
.
PartnerCategoryId
,
}
_
,
err
:=
orderSrv
.
CreateNewOrder
(
createcmd
)
return
err
orderData
,
err
:=
orderSrv
.
CreateNewOrder
(
createcmd
)
return
orderData
,
err
}
func
(
c
*
OrderInfoController
)
editOrderReal
(
param
postRealOrderDetail
)
error
{
...
...
pkg/port/beego/controllers/partner_info_controller.go
查看文件 @
cb2f186
...
...
@@ -84,11 +84,17 @@ func (c *PartnerInfoController) CreatePartnerInfo() {
}
}
serve
:=
partnerInfoService
.
NewPartnerInfoService
(
nil
)
_
,
err
=
serve
.
CreatePartnerInfo
(
&
cmd
)
newPartner
,
err
:
=
serve
.
CreatePartnerInfo
(
&
cmd
)
if
err
!=
nil
{
c
.
ResponseError
(
err
)
return
}
if
newPartner
!=
nil
{
c
.
ResponseData
(
map
[
string
]
interface
{}{
"id"
:
newPartner
.
Partner
.
Id
,
})
return
}
c
.
ResponseData
(
nil
)
return
}
...
...
请
注册
或
登录
后发表评论