diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index adec252c6..8039709f4 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -50,7 +50,7 @@ func (c *OrderManager) GetStoreOrderInfo(storeID string, lastHours int, fromStat return nil, err } -func (c *OrderManager) GetStoreOrderCountInfo(storeID string, lastHours int) (countInfo *model.GoodsOrderCountInfo, err error) { +func (c *OrderManager) GetStoreOrderCountInfo(storeID string, lastHours int) (countInfo []*model.GoodsOrderCountInfo, err error) { if lastHours > maxLastHours { lastHours = maxLastHours } diff --git a/business/model/order.go b/business/model/order.go index 0b0d9c703..096d192e6 100644 --- a/business/model/order.go +++ b/business/model/order.go @@ -39,7 +39,7 @@ type GoodsOrder struct { WaybillVendorID int `orm:"column(waybill_vendor_id)" json:"waybillVendorID"` // 表示当前承运商,-1表示还没有安排 DuplicatedCount int // 重复新订单消息数,这个一般不是由于消息重发造成的(消息重发由OrderStatus过滤),一般是业务逻辑造成的 OrderCreatedAt time.Time `orm:"type(datetime);index" json:"orderCreatedAt"` // 这里记录的是订单生效时间,即用户支付完成(货到付款即为下单时间) - OrderFinishedAt time.Time `orm:"type(datetime)" json:"OrderFinishedAt"` + OrderFinishedAt time.Time `orm:"type(datetime)" json:"orderFinishedAt"` StatusTime time.Time `orm:"type(datetime)" json:"_"` // last status time ModelTimeInfo `json:"_"` OriginalData string `orm:"type(text)" json:"_"`