切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
tangxvhui
5 years ago
提交
6255312e5d53666950044dbe5f1c5dcb43f1b37d
1 个父辈
8a127280
实际订单详情
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
76 行增加
和
1 行删除
pkg/port/beego/controllers/order_info_controlller.go
pkg/port/beego/routers/router.go
pkg/port/beego/controllers/order_info_controlller.go
查看文件 @
6255312
...
...
@@ -107,6 +107,10 @@ func (c *OrderInfoController) GetOrderPurpose() {
c
.
ResponseError
(
err
)
return
}
if
orderinfo
.
OrderType
!=
domain
.
OrderIntention
{
c
.
ResponseError
(
errors
.
New
(
"参数错误"
))
return
}
allGoods
:=
[]
map
[
string
]
interface
{}{}
for
_
,
v
:=
range
orderinfo
.
Goods
{
m
:=
map
[
string
]
interface
{}{
...
...
@@ -368,3 +372,74 @@ func (c *OrderInfoController) PageListOrderReal() {
c
.
ResponsePageList
(
rsp
,
cnt
,
param
.
PageNumber
)
return
}
//GetOrderReal 获取实发订单详情
func
(
c
*
OrderInfoController
)
GetOrderReal
()
{
type
Parameter
struct
{
Id
string
`json:"id"`
}
var
(
param
Parameter
err
error
)
if
err
=
c
.
BindJsonData
(
&
param
);
err
!=
nil
{
logs
.
Error
(
err
)
c
.
ResponseError
(
errors
.
New
(
"json数据解析失败"
))
return
}
orderid
,
_
:=
strconv
.
ParseInt
(
param
.
Id
,
10
,
64
)
orderSrv
:=
orderService
.
NewOrderInfoService
(
nil
)
orderinfo
,
err
:=
orderSrv
.
GetOrderDetail
(
orderQuery
.
GetOrderQuery
{
OrderId
:
orderid
,
})
if
err
!=
nil
{
c
.
ResponseError
(
err
)
return
}
if
orderinfo
.
OrderType
!=
domain
.
OrderReal
{
c
.
ResponseError
(
errors
.
New
(
"参数错误"
))
return
}
allGoods
:=
[]
map
[
string
]
interface
{}{}
for
_
,
v
:=
range
orderinfo
.
Goods
{
m
:=
map
[
string
]
interface
{}{
"productName"
:
v
.
GoodName
,
"orderNum"
:
v
.
PlanGoodNumber
,
"univalence"
:
v
.
Price
,
"partnerRatio"
:
v
.
PartnerBonusPercent
,
"orderPrice"
:
v
.
GoodCompute
.
PlanAmount
,
"quantityControl"
:
""
,
"priceControl"
:
""
,
}
if
v
.
GoodCompute
.
UseAmount
>=
0
{
m
[
"priceControl"
]
=
fmt
.
Sprint
(
v
.
GoodCompute
.
UseAmount
)
}
if
v
.
UseGoodNumber
>=
0
{
m
[
"quantityControl"
]
=
fmt
.
Sprint
(
v
.
UseGoodNumber
)
}
allGoods
=
append
(
allGoods
,
m
)
}
rsp
:=
map
[
string
]
interface
{}{
"buyer"
:
orderinfo
.
Buyer
.
BuyerName
,
"id"
:
orderinfo
.
Id
,
"partnerID"
:
orderinfo
.
PartnerInfo
.
Id
,
"partnerName"
:
orderinfo
.
PartnerInfo
.
PartnerName
,
"orderDist"
:
orderinfo
.
RegionInfo
.
RegionName
,
"orderId"
:
orderinfo
.
OrderCode
,
"shipmentsId"
:
orderinfo
.
DeliveryCode
,
"commissionProportion"
:
orderinfo
.
SalesmanBonusPercent
,
"orderNumCount"
:
orderinfo
.
OrderCompute
.
PlanOrderCount
,
"orderAmountAdjustmentCount"
:
orderinfo
.
OrderCompute
.
PlanOrderAmount
,
"orderNumCountControl"
:
""
,
"orderAmountAdjustmentCountControl"
:
""
,
"product"
:
allGoods
,
}
if
orderinfo
.
OrderCompute
.
UseOrderAmount
>=
0
{
rsp
[
"orderNumCountControl"
]
=
fmt
.
Sprint
(
orderinfo
.
OrderCompute
.
UseOrderAmount
)
}
if
orderinfo
.
OrderCompute
.
UseOrderCount
>=
0
{
rsp
[
"orderAmountAdjustmentCountControl"
]
=
fmt
.
Sprint
(
orderinfo
.
OrderCompute
.
UseOrderCount
)
}
c
.
ResponseData
(
rsp
)
return
}
...
...
pkg/port/beego/routers/router.go
查看文件 @
6255312
...
...
@@ -45,9 +45,9 @@ func init() {
beego
.
NSRouter
(
"/purpose/del"
,
&
controllers
.
OrderInfoController
{},
"POST:RemoveOrderPurpose"
),
beego
.
NSRouter
(
"/purpose/sendout"
,
&
controllers
.
OrderInfoController
{},
"POST:OrderPurposeDelivery"
),
beego
.
NSRouter
(
"/actual/list"
,
&
controllers
.
OrderInfoController
{},
"POST:PageListOrderReal"
),
beego
.
NSRouter
(
"/actual/detail"
,
&
controllers
.
OrderInfoController
{},
"POST:GetOrderReal"
),
beego
.
NSRouter
(
"/actual/update"
,
&
controllers
.
OrderController
{},
"POST:UpdateOrderReal"
),
beego
.
NSRouter
(
"/actual/detail"
,
&
controllers
.
OrderController
{},
"POST:GetOrderReal"
),
),
beego
.
NSNamespace
(
"/common"
,
...
...
请
注册
或
登录
后发表评论