切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
唐旭辉
4 years ago
提交
5519aa0fc9988328cb25f64fec6683db8fe09785
1 个父辈
5c769bae
调试
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
10 行增加
和
7 行删除
pkg/application/orderinfo/service/order_info.go
pkg/application/orderinfo/service/order_info.go
查看文件 @
5519aa0
...
...
@@ -918,14 +918,14 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord
"univalence"
:
orderBase
.
Goods
[
i
]
.
Price
,
"orderNum"
:
orderBase
.
Goods
[
i
]
.
GetCurrentGoodNumber
(),
"commodityPrice"
:
orderBase
.
Goods
[
i
]
.
GetCurrentAmount
(),
"partnerDividends"
:
orderBase
.
Goods
[
i
]
.
GetCurrentPartnerBonus
()
,
"partnerDividends"
:
""
,
"productId"
:
orderBase
.
Goods
[
i
]
.
Id
,
"paymentStatus"
:
orderBase
.
Goods
[
i
]
.
BonusStatus
,
"partnerRatio"
:
orderBase
.
Goods
[
i
]
.
PartnerBonusPercent
,
}
if
orderBase
.
Goods
[
i
]
.
PartnerBonusPercent
>=
0
{
hasPartnerBonusPercent
=
true
// detail["partnerRatio"] = fmt.Sprint(orderBase.Goods[i].PartnerBonusPercent
)
detail
[
"partnerDividends"
]
=
fmt
.
Sprint
(
orderBase
.
Goods
[
i
]
.
GetCurrentPartnerBonus
()
)
}
goodBestshopId
:=
orderBase
.
Goods
[
i
]
.
DataFrom
.
DataId
if
v
,
ok
:=
orderGoodBestshopMap
[
goodBestshopId
];
ok
{
...
...
@@ -936,10 +936,13 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord
}
product
:=
map
[
string
]
interface
{}{
"orderNumCount"
:
orderBase
.
GetCurrentOrderCount
(),
"partnerDividendsCount"
:
orderBase
.
GetCurrentPartnerBonus
()
,
"partnerDividendsCount"
:
""
,
"orderAmountAdjustmentCount"
:
orderBase
.
GetCurrentOrderAmount
(),
"detail"
:
productDetail
,
}
if
hasPartnerBonusPercent
{
product
[
"partnerDividendsCount"
]
=
fmt
.
Sprint
(
orderBase
.
GetCurrentPartnerBonus
())
}
//订单描述
order
:=
map
[
string
]
interface
{}{
"orderId"
:
orderBase
.
Id
,
...
...
@@ -951,10 +954,10 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord
"phone"
:
orderBestshop
.
BuyerPhone
,
"orderTime"
:
orderBestshop
.
OrderTime
,
"shippingStatus"
:
orderBestshop
.
DeliveryState
,
"partnerDividends"
:
"-"
,
"receivedDividends"
:
"-"
,
"notReceivedDividend"
:
"-"
,
"dividendSpending"
:
"-"
,
"partnerDividends"
:
""
,
"receivedDividends"
:
""
,
"notReceivedDividend"
:
""
,
"dividendSpending"
:
""
,
"orderNumber"
:
orderBase
.
OrderCode
,
}
if
hasPartnerBonusPercent
{
...
...
请
注册
或
登录
后发表评论