From b7de9d40040895868f228dfc39090d3b917ec548 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 18 Jul 2019 23:09:23 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=B9=B3=E5=8F=B0=E5=B1=82=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E8=AE=BE=E7=BD=AEOrderCreatedAt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxutils/jxutils.go | 1 - business/partner/purchase/ebai/order.go | 1 + business/partner/purchase/jd/order.go | 1 + business/partner/purchase/mtwm/order.go | 1 + business/partner/purchase/weimob/wsc/order.go | 1 + 5 files changed, 4 insertions(+), 1 deletion(-) diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go index dbe6d3be6..19d56eebb 100644 --- a/business/jxutils/jxutils.go +++ b/business/jxutils/jxutils.go @@ -476,7 +476,6 @@ func RefreshOrderSkuRelated(order *model.GoodsOrder) *model.GoodsOrder { order.SalePrice = 0 order.VendorPrice = 0 order.Weight = 0 - order.OrderCreatedAt = order.StatusTime for _, sku := range order.Skus { if sku.SkuID > math.MaxInt32 { sku.SkuID = 0 diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 7cc70ef7a..683c7e874 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -181,6 +181,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo VendorStatus: utils.Int64ToStr(utils.MustInterface2Int64(orderMap["status"])), OrderSeq: int(utils.Str2Int64(utils.Interface2String(orderMap["order_index"]))), StatusTime: getTimeFromInterface(orderMap["create_time"]), + OrderCreatedAt: getTimeFromInterface(orderMap["create_time"]), OriginalData: string(utils.MustMarshal(result)), ActualPayPrice: utils.MustInterface2Int64(orderMap["user_fee"]), TotalShopMoney: utils.MustInterface2Int64(orderMap["shop_fee"]), diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index f2cda5a2d..453af3bd7 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -175,6 +175,7 @@ func (c *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo VendorStatus: utils.Int64ToStr(utils.MustInterface2Int64(result["orderStatus"])), OrderSeq: int(utils.MustInterface2Int64(result["orderNum"])), StatusTime: utils.Str2Time(result[statusTimeField].(string)), + OrderCreatedAt: utils.Str2Time(result[statusTimeField].(string)), OriginalData: string(utils.MustMarshal(result)), ActualPayPrice: utils.MustInterface2Int64(result["orderBuyerPayableMoney"]), } diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index d7ec97c45..ea5eea566 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -117,6 +117,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo VendorStatus: utils.Int64ToStr(utils.MustInterface2Int64(result["status"])), OrderSeq: int(utils.MustInterface2Int64(result["day_seq"])), StatusTime: getTimeFromTimestamp(utils.MustInterface2Int64(result["ctime"])), + OrderCreatedAt: getTimeFromTimestamp(utils.MustInterface2Int64(result["ctime"])), OriginalData: string(utils.MustMarshal(result)), ActualPayPrice: jxutils.StandardPrice2Int(utils.MustInterface2Float64(result["total"])), } diff --git a/business/partner/purchase/weimob/wsc/order.go b/business/partner/purchase/weimob/wsc/order.go index 66eef0675..da175f764 100644 --- a/business/partner/purchase/weimob/wsc/order.go +++ b/business/partner/purchase/weimob/wsc/order.go @@ -127,6 +127,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo PickDeadline: utils.DefaultTimeValue, VendorStatus: utils.Int64ToStr(utils.MustInterface2Int64(result["orderStatus"])), StatusTime: utils.Timestamp2Time(utils.MustInterface2Int64(result["createTime"]) / 1000), + OrderCreatedAt: utils.Timestamp2Time(utils.MustInterface2Int64(result["createTime"]) / 1000), OriginalData: string(utils.MustMarshal(result)), ActualPayPrice: jxutils.StandardPrice2Int(utils.MustInterface2Float64(result["totalAmount"])), BusinessType: model.BusinessTypeImmediate,