正在显示
1 个修改的文件
包含
10 行增加
和
7 行删除
@@ -918,14 +918,14 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord | @@ -918,14 +918,14 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord | ||
918 | "univalence": orderBase.Goods[i].Price, | 918 | "univalence": orderBase.Goods[i].Price, |
919 | "orderNum": orderBase.Goods[i].GetCurrentGoodNumber(), | 919 | "orderNum": orderBase.Goods[i].GetCurrentGoodNumber(), |
920 | "commodityPrice": orderBase.Goods[i].GetCurrentAmount(), | 920 | "commodityPrice": orderBase.Goods[i].GetCurrentAmount(), |
921 | - "partnerDividends": orderBase.Goods[i].GetCurrentPartnerBonus(), | 921 | + "partnerDividends": "", |
922 | "productId": orderBase.Goods[i].Id, | 922 | "productId": orderBase.Goods[i].Id, |
923 | "paymentStatus": orderBase.Goods[i].BonusStatus, | 923 | "paymentStatus": orderBase.Goods[i].BonusStatus, |
924 | "partnerRatio": orderBase.Goods[i].PartnerBonusPercent, | 924 | "partnerRatio": orderBase.Goods[i].PartnerBonusPercent, |
925 | } | 925 | } |
926 | if orderBase.Goods[i].PartnerBonusPercent >= 0 { | 926 | if orderBase.Goods[i].PartnerBonusPercent >= 0 { |
927 | hasPartnerBonusPercent = true | 927 | hasPartnerBonusPercent = true |
928 | - // detail["partnerRatio"] = fmt.Sprint(orderBase.Goods[i].PartnerBonusPercent) | 928 | + detail["partnerDividends"] = fmt.Sprint(orderBase.Goods[i].GetCurrentPartnerBonus()) |
929 | } | 929 | } |
930 | goodBestshopId := orderBase.Goods[i].DataFrom.DataId | 930 | goodBestshopId := orderBase.Goods[i].DataFrom.DataId |
931 | if v, ok := orderGoodBestshopMap[goodBestshopId]; ok { | 931 | if v, ok := orderGoodBestshopMap[goodBestshopId]; ok { |
@@ -936,10 +936,13 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord | @@ -936,10 +936,13 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord | ||
936 | } | 936 | } |
937 | product := map[string]interface{}{ | 937 | product := map[string]interface{}{ |
938 | "orderNumCount": orderBase.GetCurrentOrderCount(), | 938 | "orderNumCount": orderBase.GetCurrentOrderCount(), |
939 | - "partnerDividendsCount": orderBase.GetCurrentPartnerBonus(), | 939 | + "partnerDividendsCount": "", |
940 | "orderAmountAdjustmentCount": orderBase.GetCurrentOrderAmount(), | 940 | "orderAmountAdjustmentCount": orderBase.GetCurrentOrderAmount(), |
941 | "detail": productDetail, | 941 | "detail": productDetail, |
942 | } | 942 | } |
943 | + if hasPartnerBonusPercent { | ||
944 | + product["partnerDividendsCount"] = fmt.Sprint(orderBase.GetCurrentPartnerBonus()) | ||
945 | + } | ||
943 | //订单描述 | 946 | //订单描述 |
944 | order := map[string]interface{}{ | 947 | order := map[string]interface{}{ |
945 | "orderId": orderBase.Id, | 948 | "orderId": orderBase.Id, |
@@ -951,10 +954,10 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord | @@ -951,10 +954,10 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord | ||
951 | "phone": orderBestshop.BuyerPhone, | 954 | "phone": orderBestshop.BuyerPhone, |
952 | "orderTime": orderBestshop.OrderTime, | 955 | "orderTime": orderBestshop.OrderTime, |
953 | "shippingStatus": orderBestshop.DeliveryState, | 956 | "shippingStatus": orderBestshop.DeliveryState, |
954 | - "partnerDividends": "-", | ||
955 | - "receivedDividends": "-", | ||
956 | - "notReceivedDividend": "-", | ||
957 | - "dividendSpending": "-", | 957 | + "partnerDividends": "", |
958 | + "receivedDividends": "", | ||
959 | + "notReceivedDividend": "", | ||
960 | + "dividendSpending": "", | ||
958 | "orderNumber": orderBase.OrderCode, | 961 | "orderNumber": orderBase.OrderCode, |
959 | } | 962 | } |
960 | if hasPartnerBonusPercent { | 963 | if hasPartnerBonusPercent { |
-
请 注册 或 登录 后发表评论