mmm-go / partnermg · 提交

转到一个项目

作者 唐旭辉
提交 9701b1e9e681d58cb1bc17632fb083460f54da43 1 个父辈 94e49f11

orderid 输出 number 转 string

内嵌 并排对比
正在显示 3 个修改的文件 包含 5 行增加 和 5 行删除
@@ -87,7 +87,7 @@ func (service OrderInfoService) PageListOrderBase(listOrderQuery query.ListOrder @@ -87,7 +87,7 @@ func (service OrderInfoService) PageListOrderBase(listOrderQuery query.ListOrder
87 "createTime": orders[i].CreateTime.Local().Format("2006-01-02 15:04:05"), 87 "createTime": orders[i].CreateTime.Local().Format("2006-01-02 15:04:05"),
88 "updateTime": orders[i].UpdateTime.Local().Format("2006-01-02 15:04:05"), 88 "updateTime": orders[i].UpdateTime.Local().Format("2006-01-02 15:04:05"),
89 "buyer": orders[i].Buyer.BuyerName, 89 "buyer": orders[i].Buyer.BuyerName,
90 - "id": orders[i].Id, 90 + "id": fmt.Sprint(orders[i].Id),
91 "orderId": orders[i].OrderCode, 91 "orderId": orders[i].OrderCode,
92 "shipmentsId": orders[i].DeliveryCode, 92 "shipmentsId": orders[i].DeliveryCode,
93 "partner": partnerData.Partner.PartnerName, 93 "partner": partnerData.Partner.PartnerName,
@@ -873,7 +873,7 @@ func (service OrderInfoService) PageListOrderBonus(listOrderQuery query.ListOrde @@ -873,7 +873,7 @@ func (service OrderInfoService) PageListOrderBonus(listOrderQuery query.ListOrde
873 "index": listIndex, 873 "index": listIndex,
874 "createTime": orders[i].CreateTime.Local().Format("2006-01-02 15:04:05"), 874 "createTime": orders[i].CreateTime.Local().Format("2006-01-02 15:04:05"),
875 "updateTime": orders[i].UpdateTime.Local().Format("2006-01-02 15:04:05"), 875 "updateTime": orders[i].UpdateTime.Local().Format("2006-01-02 15:04:05"),
876 - "id": orders[i].Id, 876 + "id": fmt.Sprint(orders[i].Id),
877 "shipmentsId": orders[i].DeliveryCode, 877 "shipmentsId": orders[i].DeliveryCode,
878 "partner": orders[i].PartnerInfo.PartnerName, 878 "partner": orders[i].PartnerInfo.PartnerName,
879 "dividendsReceivable": fmt.Sprint(orders[i].GetCurrentPartnerBonus()), 879 "dividendsReceivable": fmt.Sprint(orders[i].GetCurrentPartnerBonus()),
@@ -172,7 +172,7 @@ func (service OrderInfoService) buildOrderBaseInfoData(orderBase *domain.OrderBa @@ -172,7 +172,7 @@ func (service OrderInfoService) buildOrderBaseInfoData(orderBase *domain.OrderBa
172 } 172 }
173 //订单描述 173 //订单描述
174 order := map[string]interface{}{ 174 order := map[string]interface{}{
175 - "orderId": orderBase.Id, 175 + "orderId": fmt.Sprint(orderBase.Id),
176 "orderType": orderBase.OrderType, 176 "orderType": orderBase.OrderType,
177 "orderTypeName": domain.GetOrderBaseTypeName(orderBase.OrderType), 177 "orderTypeName": domain.GetOrderBaseTypeName(orderBase.OrderType),
178 "orderState": "", 178 "orderState": "",
@@ -384,7 +384,7 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord @@ -384,7 +384,7 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord
384 } 384 }
385 //订单描述 385 //订单描述
386 order := map[string]interface{}{ 386 order := map[string]interface{}{
387 - "orderId": orderBase.Id, 387 + "orderId": fmt.Sprint(orderBase.Id),
388 "orderType": orderBase.OrderType, 388 "orderType": orderBase.OrderType,
389 "orderTypeName": domain.GetOrderBaseTypeName(orderBase.OrderType), 389 "orderTypeName": domain.GetOrderBaseTypeName(orderBase.OrderType),
390 "orderState": orderBestshop.OrderState, 390 "orderState": orderBestshop.OrderState,
@@ -277,7 +277,7 @@ func (c *OrderInfoController) GetOrderReal() { @@ -277,7 +277,7 @@ func (c *OrderInfoController) GetOrderReal() {
277 allGoods := []map[string]interface{}{} 277 allGoods := []map[string]interface{}{}
278 for _, v := range orderinfo.Goods { 278 for _, v := range orderinfo.Goods {
279 m := map[string]interface{}{ 279 m := map[string]interface{}{
280 - "id": v.Id, 280 + "id": fmt.Sprint(v.Id),
281 "productName": v.GoodName, 281 "productName": v.GoodName,
282 "orderNum": v.PlanGoodNumber, 282 "orderNum": v.PlanGoodNumber,
283 "univalence": v.Price, 283 "univalence": v.Price,