...
|
...
|
@@ -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 {
|
...
|
...
|
|