diff --git a/business/freshfood/freshfood.go b/business/freshfood/freshfood.go index 2d44ccb21..807532f0c 100644 --- a/business/freshfood/freshfood.go +++ b/business/freshfood/freshfood.go @@ -129,7 +129,7 @@ func (f *FreshFoodAPI) NewJDOrder(jdorder *models.Jdorder) error { func (f *FreshFoodAPI) JDOrderStatus(jdorder *models.Jdorder) error { params := make(url.Values) params.Set(URL_FRESHFOOD_PARA_VENDERID, utils.Int2Str(JD_VENDERID)) - params.Set(URL_FRESHFOOD_PARA_ORDERID, utils.Int64ToStr(jdorder.JdOrderId)) + params.Set(URL_FRESHFOOD_PARA_ORDERID, utils.Int64ToStr(jdorder.JdOrderID)) params.Set(URL_FRESHFOOD_PARA_ORDERSTATUS, utils.Int2Str(jdorder.OrderStatus)) params.Set(URL_FRESHFOOD_PARA_ORDERSTATUSTIME, jdorder.OrderStatusTime) params.Set(URL_FRESHFOOD_PARA_CITYNAME, jdorder.CityName) @@ -177,8 +177,8 @@ func (f *FreshFoodAPI) ELMOrderStatus(orderId string, status int, timestamp int6 // mtps api func (f *FreshFoodAPI) MtpsOrderStatusChanged(order *mtpsapi.CallbackOrderMsg) error { params := make(url.Values) - params.Set(URL_FRESHFOOD_PARA_DELIVERYID, utils.Int64ToStr(order.DeliveryId)) - params.Set(URL_FRESHFOOD_PARA_MTPEISONID, order.MtPeisongId) + params.Set(URL_FRESHFOOD_PARA_DELIVERYID, utils.Int64ToStr(order.DeliveryID)) + params.Set(URL_FRESHFOOD_PARA_MTPEISONID, order.MtPeisongID) params.Set(URL_FRESHFOOD_PARA_ORDERID, order.OrderId) params.Set(URL_FRESHFOOD_PARA_STATUS, utils.Int2Str(order.Status)) params.Set(URL_FRESHFOOD_PARA_COURIERNAME, order.CourierName) @@ -194,8 +194,8 @@ func (f *FreshFoodAPI) MtpsOrderStatusChanged(order *mtpsapi.CallbackOrderMsg) e func (f *FreshFoodAPI) MtpsOrderException(order *mtpsapi.CallbackOrderExceptionMsg) error { params := make(url.Values) - params.Set(URL_FRESHFOOD_PARA_DELIVERYID, utils.Int64ToStr(order.DeliveryId)) - params.Set(URL_FRESHFOOD_PARA_MTPEISONID, order.MtPeisongId) + params.Set(URL_FRESHFOOD_PARA_DELIVERYID, utils.Int64ToStr(order.DeliveryID)) + params.Set(URL_FRESHFOOD_PARA_MTPEISONID, order.MtPeisongID) params.Set(URL_FRESHFOOD_PARA_ORDERID, order.OrderId) params.Set(URL_FRESHFOOD_PARA_EXCEPTIONID, utils.Int64ToStr(order.ExceptionID)) params.Set(URL_FRESHFOOD_PARA_EXCEPTIONCODE, utils.Int2Str(order.ExceptionCode)) diff --git a/business/jd/controller/order.go b/business/jd/controller/order.go index 739303dfa..1d62b954e 100644 --- a/business/jd/controller/order.go +++ b/business/jd/controller/order.go @@ -44,8 +44,8 @@ func handlePendingOrderMsg() { } else { for _, jdOrderInfo := range ordersInfo { orderMsg := &jdapi.CallbackOrderMsg{ - ID: jdOrderInfo.Id, - BillID: utils.Int64ToStr(jdOrderInfo.JdOrderId), + ID: jdOrderInfo.ID, + BillID: utils.Int64ToStr(jdOrderInfo.JdOrderID), StatusID: utils.Int2Str(jdOrderInfo.OrderStatus), Timestamp: jdOrderInfo.OrderStatusTime, } @@ -93,13 +93,13 @@ func (c *OrderController) OrderStatus(order *jdapi.CallbackOrderMsg) *jdapi.Call status := utils.Str2Int(order.StatusID) rec := &models.Jdorder{ Code: MsgNotHandledCode, - JdOrderId: jdorderid, + JdOrderID: jdorderid, OrderStatus: status, OrderStatusTime: order.Timestamp, } if created, _, err := db.ReadOrCreate(rec, "Jdorderid"); err == nil { - order.ID = rec.Id + order.ID = rec.ID if created { if order.StatusID != jdapi.OrderStatusNew && order.StatusID != jdapi.OrderStatusAdjust { globals.SugarLogger.Warnf("order:%v get before create", order) @@ -153,7 +153,7 @@ func newOrder(order *jdapi.CallbackOrderMsg) error { acceptOrder(order) if err == nil { rec := &models.Jdorder{ - Id: order.ID, + ID: order.ID, } rec.Code, _ = result["code"].(string) @@ -203,7 +203,7 @@ func adjustOrder(order *jdapi.CallbackOrderMsg) error { func normalOrderStatus(order *jdapi.CallbackOrderMsg) error { db := orm.NewOrm() rec := &models.Jdorder{ - JdOrderId: utils.Str2Int64(order.BillID), + JdOrderID: utils.Str2Int64(order.BillID), } err := db.Read(rec, "JdOrderId") diff --git a/business/jd/models/order.go b/business/jd/models/order.go index 858c4e1cf..6cd6f180e 100644 --- a/business/jd/models/order.go +++ b/business/jd/models/order.go @@ -1,12 +1,12 @@ package models type Jdorder struct { - Id int + ID int `orm:"column(id)"` Code string `orm:"size(8)"` Msg string `orm:"size(100)"` Data string `orm:"type(text)"` Success int8 - JdOrderId int64 `orm:"unique;column(jdorderid)"` + JdOrderID int64 `orm:"unique;column(jdorderid)"` CityName string `orm:"size(20);column(cityname)"` OrderStatus int `orm:"column(orderstatus)"` OrderStatusTime string `orm:"size(50);column(orderstatustime)"` diff --git a/conf/app.conf b/conf/app.conf index fee32eab6..72af2fee3 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -1,5 +1,5 @@ appname = jx-callback -httpport = 8888 +httpport = 8080 runmode = dev autorender = false copyrequestbody = true