diff --git a/business/controller/elm/order.go b/business/controller/elm/order.go index 900db6043..ee2f377ab 100644 --- a/business/controller/elm/order.go +++ b/business/controller/elm/order.go @@ -140,7 +140,7 @@ func (c *OrderController) getOrderInfo(orderID string) (order *model.GoodsOrder, ExpectedDeliveredTime: utils.Str2TimeWithDefault(utils.Interface2String(result["deliverTime"]), utils.DefaultTimeValue), VendorStatus: utils.Interface2String(result["status"]), // 取订单的原始status,不合并消息类型(因为当前消息类型没有意义) OrderSeq: int(utils.MustInterface2Int64(result["daySn"])), - StatusTime: utils.Str2Time(result["createdAt"].(string)), + StatusTime: utils.Str2Time(result["activeAt"].(string)), OriginalData: utils.FilterMb4(string(utils.MustMarshal(result))), ActualPayPrice: jxutils.StandardPrice2Int(utils.MustInterface2Float64(result["totalPrice"])), Skus: []*model.OrderSku{}, diff --git a/business/controller/jd/order.go b/business/controller/jd/order.go index 180366da5..1b037f745 100644 --- a/business/controller/jd/order.go +++ b/business/controller/jd/order.go @@ -79,7 +79,7 @@ func (c *OrderController) getOrderInfo(msg *jdapi.CallbackOrderMsg) (order *mode ExpectedDeliveredTime: utils.Str2TimeWithDefault(utils.Interface2String(result["orderPreEndDeliveryTime"]), utils.DefaultTimeValue), VendorStatus: msg.StatusID, OrderSeq: int(utils.MustInterface2Int64(result["orderNum"])), - StatusTime: utils.Str2Time(result["orderStartTime"].(string)), + StatusTime: utils.Str2Time(result["orderPurchaseTime"].(string)), OriginalData: utils.FilterMb4(string(utils.MustMarshal(result))), ActualPayPrice: utils.MustInterface2Int64(result["orderBuyerPayableMoney"]), Skus: []*model.OrderSku{}, diff --git a/business/model/order.go b/business/model/order.go index 1c5c97230..d465f8a23 100644 --- a/business/model/order.go +++ b/business/model/order.go @@ -38,7 +38,7 @@ type GoodsOrder struct { CancelApplyReason string `orm:"size(255)"` // ""表示没有申请,不为null表示用户正在取消申请 WaybillVendorID int `orm:"column(waybill_vendor_id)"` // 表示当前承运商,-1表示还没有安排 DuplicatedCount int // 重复新订单消息数,这个一般不是由于消息重发造成的(消息重发由OrderStatus过滤),一般是业务逻辑造成的 - OrderCreatedAt time.Time `orm:"type(datetime);index"` + OrderCreatedAt time.Time `orm:"type(datetime);index"` // 这里记录的是订单生效时间,即用户支付完成(货到付款即为下单时间) OrderFinishedAt time.Time `orm:"type(datetime)"` StatusTime time.Time `orm:"type(datetime)"` // last status time ModelTimeInfo