切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
唐旭辉
5 years ago
提交
9ca73143d301a6f2e55402a2d940f34883385ca3
1 个父辈
4fe5a99e
bug 修复
隐藏空白字符变更
内嵌
并排对比
正在显示
6 个修改的文件
包含
20 行增加
和
14 行删除
pkg/application/orderinfo/service/order_info.go
pkg/domain/order_base.go
pkg/infrastructure/pg/models/order_base.go
pkg/infrastructure/serviceGateway/httplib_usercenter_service.go
pkg/port/beego/controllers/business_bonus_controller.go
pkg/port/beego/routers/router.go
pkg/application/orderinfo/service/order_info.go
查看文件 @
9ca7314
...
...
@@ -201,10 +201,10 @@ func (service OrderInfoService) CreateNewOrder(cmd command.CreateOrderCommand) (
newOrder
:=
&
domain
.
OrderBase
{
OrderType
:
cmd
.
OrderType
,
OrderCode
:
cmd
.
OrderCode
,
DeliveryCode
:
cmd
.
DeliveryCode
,
Buyer
:
&
domain
.
Buyer
{
Buyer
:
domain
.
Buyer
{
BuyerName
:
cmd
.
BuyerName
,
},
RegionInfo
:
&
domain
.
RegionInfo
{
RegionInfo
:
domain
.
RegionInfo
{
RegionName
:
cmd
.
OrderRegion
,
},
PartnerId
:
cmd
.
PartnerId
,
...
...
pkg/domain/order_base.go
查看文件 @
9ca7314
...
...
@@ -37,9 +37,9 @@ type OrderBase struct {
//交货编号
DeliveryCode
string
`json:"deliveryCode"`
//买家
Buyer
*
Buyer
`json:"buyer"`
Buyer
Buyer
`json:"buyer"`
//订单区域信息
RegionInfo
*
RegionInfo
`json:"regionInfo"`
RegionInfo
RegionInfo
`json:"regionInfo"`
//订单对应的合伙人
PartnerId
int64
`json:"partnerId"`
PartnerInfo
Partner
`json:"partnerInfo"`
...
...
pkg/infrastructure/pg/models/order_base.go
查看文件 @
9ca7314
...
...
@@ -20,9 +20,9 @@ type OrderBase struct {
//交货编号
DeliveryCode
string
//买家
Buyer
*
domain
.
Buyer
Buyer
domain
.
Buyer
//订单区域信息
RegionInfo
*
domain
.
RegionInfo
RegionInfo
domain
.
RegionInfo
//订单对应的合伙人
PartnerId
int64
//业务员抽成比例
...
...
pkg/infrastructure/serviceGateway/httplib_usercenter_service.go
查看文件 @
9ca7314
...
...
@@ -104,5 +104,8 @@ func (gateway MmmUserCenterServiceGateway) RequestUCenterLoginBySecret(secret st
}
respData
:=
&
ResponseLogin
{}
err
=
json
.
Unmarshal
(
byteData
,
respData
)
return
respData
,
err
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"body data %s; err:%s"
,
string
(
byteData
),
err
)
}
return
respData
,
nil
}
...
...
pkg/port/beego/controllers/business_bonus_controller.go
查看文件 @
9ca7314
...
...
@@ -62,9 +62,9 @@ func (c *BusinessBonusController) ListBusinessBonus() {
func
(
c
*
BusinessBonusController
)
UpdateBusinessBonus
()
{
type
Parameter
struct
{
Id
int64
`json:"id"`
DividendsReceivable
string
`json:"dividendsReceivable"`
StateOfPayment
string
`json:"stateOfPayment"`
Id
int64
`json:"id"`
DividendsReceivable
float64
`json:"dividendsReceivable"`
StateOfPayment
int8
`json:"stateOfPayment"`
}
var
(
param
Parameter
...
...
@@ -78,7 +78,10 @@ func (c *BusinessBonusController) UpdateBusinessBonus() {
companyId
:=
c
.
GetUserCompany
()
srv
:=
businessService
.
NewBusinessBonusService
(
nil
)
err
=
srv
.
UpdateBusinessBonus
(
businessCommand
.
UpdateBusinessBonusCommand
{
CompanyId
:
companyId
,
CompanyId
:
companyId
,
Id
:
param
.
Id
,
Bonus
:
param
.
DividendsReceivable
,
BonusStatus
:
param
.
StateOfPayment
,
})
if
err
!=
nil
{
c
.
ResponseError
(
err
)
...
...
pkg/port/beego/routers/router.go
查看文件 @
9ca7314
...
...
@@ -33,9 +33,9 @@ func init() {
beego
.
NSRouter
(
"/edit"
,
&
controllers
.
OrderDividendController
{},
"POST:EditOrderDividend"
),
beego
.
NSRouter
(
"/detail"
,
&
controllers
.
OrderDividendController
{},
"POST:OrderDividendDetail"
),
beego
.
NSRouter
(
"business/detail"
,
&
controllers
.
BusinessBonusController
{},
"POST:GetBusinessBonus"
),
beego
.
NSRouter
(
"business/edit"
,
&
controllers
.
BusinessBonusController
{},
"POST:UpdateBusinessBonus"
),
beego
.
NSRouter
(
"business/list"
,
&
controllers
.
BusinessBonusController
{},
"POST:ListBusinessBonus"
),
beego
.
NSRouter
(
"/business/detail"
,
&
controllers
.
BusinessBonusController
{},
"POST:GetBusinessBonus"
),
beego
.
NSRouter
(
"/business/edit"
,
&
controllers
.
BusinessBonusController
{},
"POST:UpdateBusinessBonus"
),
beego
.
NSRouter
(
"/business/list"
,
&
controllers
.
BusinessBonusController
{},
"POST:ListBusinessBonus"
),
),
beego
.
NSNamespace
(
"/order"
,
beego
.
NSRouter
(
"/purpose/list"
,
&
controllers
.
OrderInfoController
{},
"POST:PageListOrderPurpose"
),
...
...
请
注册
或
登录
后发表评论