liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- change OrderCreatedAt to to purchase completed time, not start time.

Browse Source
This commit is contained in:
gazebo
2018-07-22 08:29:34 +08:00
parent ae6198220c
commit dcdf432ac9
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/controller/elm/order.go
View File

@@ -140,7 +140,7 @@ func (c *OrderController) getOrderInfo(orderID string) (order *model.GoodsOrder,
ExpectedDeliveredTime: utils.Str2TimeWithDefault(utils.Interface2String(result["deliverTime"]), utils.DefaultTimeValue), ExpectedDeliveredTime: utils.Str2TimeWithDefault(utils.Interface2String(result["deliverTime"]), utils.DefaultTimeValue),
VendorStatus: utils.Interface2String(result["status"]), // 取订单的原始status，不合并消息类型（因为当前消息类型没有意义） VendorStatus: utils.Interface2String(result["status"]), // 取订单的原始status，不合并消息类型（因为当前消息类型没有意义）
OrderSeq: int(utils.MustInterface2Int64(result["daySn"])), 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))), OriginalData: utils.FilterMb4(string(utils.MustMarshal(result))),
ActualPayPrice: jxutils.StandardPrice2Int(utils.MustInterface2Float64(result["totalPrice"])), ActualPayPrice: jxutils.StandardPrice2Int(utils.MustInterface2Float64(result["totalPrice"])),
Skus: []*model.OrderSku{}, Skus: []*model.OrderSku{},

2
business/controller/jd/order.go
View File

@@ -79,7 +79,7 @@ func (c *OrderController) getOrderInfo(msg *jdapi.CallbackOrderMsg) (order *mode
ExpectedDeliveredTime: utils.Str2TimeWithDefault(utils.Interface2String(result["orderPreEndDeliveryTime"]), utils.DefaultTimeValue), ExpectedDeliveredTime: utils.Str2TimeWithDefault(utils.Interface2String(result["orderPreEndDeliveryTime"]), utils.DefaultTimeValue),
VendorStatus: msg.StatusID, VendorStatus: msg.StatusID,
OrderSeq: int(utils.MustInterface2Int64(result["orderNum"])), 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))), OriginalData: utils.FilterMb4(string(utils.MustMarshal(result))),
ActualPayPrice: utils.MustInterface2Int64(result["orderBuyerPayableMoney"]), ActualPayPrice: utils.MustInterface2Int64(result["orderBuyerPayableMoney"]),
Skus: []*model.OrderSku{}, Skus: []*model.OrderSku{},

2
business/model/order.go
View File

@@ -38,7 +38,7 @@ type GoodsOrder struct {
CancelApplyReason string `orm:"size(255)"` // ""表示没有申请，不为null表示用户正在取消申请 CancelApplyReason string `orm:"size(255)"` // ""表示没有申请，不为null表示用户正在取消申请
WaybillVendorID int `orm:"column(waybill_vendor_id)"` // 表示当前承运商，-1表示还没有安排 WaybillVendorID int `orm:"column(waybill_vendor_id)"` // 表示当前承运商，-1表示还没有安排
DuplicatedCount int // 重复新订单消息数，这个一般不是由于消息重发造成的（消息重发由OrderStatus过滤），一般是业务逻辑造成的 DuplicatedCount int // 重复新订单消息数，这个一般不是由于消息重发造成的（消息重发由OrderStatus过滤），一般是业务逻辑造成的
OrderCreatedAt time.Time `orm:"type(datetime);index"` OrderCreatedAt time.Time `orm:"type(datetime);index"` // 这里记录的是订单生效时间，即用户支付完成（货到付款即为下单时间）
OrderFinishedAt time.Time `orm:"type(datetime)"` OrderFinishedAt time.Time `orm:"type(datetime)"`
StatusTime time.Time `orm:"type(datetime)"` // last status time StatusTime time.Time `orm:"type(datetime)"` // last status time
ModelTimeInfo ModelTimeInfo