From 49ec11baf880ec8b115bc2dbc503c8f64621909e Mon Sep 17 00:00:00 2001 From: gazebo Date: Sun, 8 Jul 2018 18:46:32 +0800 Subject: [PATCH] - change all vender to vendor. --- legacy/controllers/business.go | 12 ++++++------ legacy/elm/controller/order.go | 2 +- legacy/freshfood/freshfood.go | 10 +++++----- legacy/jd/controller/order.go | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/legacy/controllers/business.go b/legacy/controllers/business.go index 0c620eb88..af4a45214 100644 --- a/legacy/controllers/business.go +++ b/legacy/controllers/business.go @@ -7,11 +7,11 @@ import ( ) const ( - JD_VENDERID = 0 - ELM_VENDERID = 2 + JD_VENDORID = 0 + ELM_VENDORID = 2 ) -func OnNewOrder(orderID string, venderID int, userMobile string, jxStoreID int, db orm.Ormer, handler func(accepted bool)) int { +func OnNewOrder(orderID string, vendorID int, userMobile string, jxStoreID int, db orm.Ormer, handler func(accepted bool)) int { handleType := 0 if userMobile != "" { if db == nil { @@ -22,17 +22,17 @@ func OnNewOrder(orderID string, venderID int, userMobile string, jxStoreID int, } if err := db.Read(user, "Mobile"); err != nil { if err != orm.ErrNoRows { - globals.SugarLogger.Errorf("read data error:%v, data:%v, venderID:%d", err, user, venderID) + globals.SugarLogger.Errorf("read data error:%v, data:%v, vendorID:%d", err, user, vendorID) } // 在访问数据库出错的情况下，也需要自动接单 handleType = 1 } else { // 强制拒单 - globals.SugarLogger.Infof("force reject order:%s, venderID:%d", orderID, venderID) + globals.SugarLogger.Infof("force reject order:%s, vendorID:%d", orderID, vendorID) handleType = -1 } } else { - globals.SugarLogger.Infof("order:%s, venderID:%d, mobile is empty, should accept it", orderID, venderID) + globals.SugarLogger.Infof("order:%s, vendorID:%d, mobile is empty, should accept it", orderID, vendorID) handleType = 1 } diff --git a/legacy/elm/controller/order.go b/legacy/elm/controller/order.go index 17774692f..0eaf683f8 100644 --- a/legacy/elm/controller/order.go +++ b/legacy/elm/controller/order.go @@ -54,7 +54,7 @@ func (o *OrderController) OrderMessage(msg *elmapi.CallbackMsg) (retVal *elmapi. } func OnNewOrder(orderID string, userMobile string) { - controllers.OnNewOrder(orderID, controllers.ELM_VENDERID, userMobile, 0, nil, func(acceptIt bool) { + controllers.OnNewOrder(orderID, controllers.ELM_VENDORID, userMobile, 0, nil, func(acceptIt bool) { if acceptIt { api.ElmAPI.ConfirmOrder(orderID) } else { diff --git a/legacy/freshfood/freshfood.go b/legacy/freshfood/freshfood.go index 2b3388248..601c68924 100644 --- a/legacy/freshfood/freshfood.go +++ b/legacy/freshfood/freshfood.go @@ -36,7 +36,7 @@ const ( const ( URL_FRESHFOOD_PARA_JDORDER = "jdOrder" - URL_FRESHFOOD_PARA_VENDERID = "venderId" + URL_FRESHFOOD_PARA_VENDORID = "venderId" URL_FRESHFOOD_PARA_ORDERID = "orderId" URL_FRESHFOOD_PARA_ORDERSTATUS = "orderStatus" URL_FRESHFOOD_PARA_ORDERSTATUSTIME = "orderStatusTime" @@ -159,7 +159,7 @@ func (f *API) NewJDOrder(jdorder *models.Jdorder, isNew bool) error { func (f *API) JDOrderStatus(msg *jdapi.CallbackOrderMsg) error { params := make(url.Values) - params.Set(URL_FRESHFOOD_PARA_VENDERID, utils.Int2Str(controllers.JD_VENDERID)) + params.Set(URL_FRESHFOOD_PARA_VENDORID, utils.Int2Str(controllers.JD_VENDORID)) params.Set(URL_FRESHFOOD_PARA_ORDERID, msg.BillID) params.Set(URL_FRESHFOOD_PARA_ORDERSTATUS, msg.StatusID) params.Set(URL_FRESHFOOD_PARA_ORDERSTATUSTIME, msg.Timestamp) @@ -180,7 +180,7 @@ func (f *API) JDOrderDeliveryStatus(jdOrderDeliveryStatusMsg *jdapi.CallbackDeli params := make(url.Values) cityName := "all" - params.Set(URL_FRESHFOOD_PARA_VENDERID, utils.Int2Str(controllers.JD_VENDERID)) + params.Set(URL_FRESHFOOD_PARA_VENDORID, utils.Int2Str(controllers.JD_VENDORID)) params.Set(URL_FRESHFOOD_PARA_ORDERID, jdOrderDeliveryStatusMsg.OrderID) params.Set(URL_FRESHFOOD_PARA_DELIVERYSTATUS, jdOrderDeliveryStatusMsg.DeliveryStatus) params.Set(URL_FRESHFOOD_PARA_DLIVERYSTATUSTIME, jdOrderDeliveryStatusMsg.DeliveryStatusTime) @@ -205,7 +205,7 @@ func (f *API) NewELMOrder(order map[string]interface{}) error { func (f *API) ELMOrderStatus(orderId string, status int, statusTime string) error { params := make(url.Values) - params.Set(URL_FRESHFOOD_PARA_VENDERID, utils.Int2Str(controllers.ELM_VENDERID)) + params.Set(URL_FRESHFOOD_PARA_VENDORID, utils.Int2Str(controllers.ELM_VENDORID)) params.Set(URL_FRESHFOOD_PARA_ORDERID, orderId) params.Set(URL_FRESHFOOD_PARA_ORDERSTATUS, utils.Int2Str(status)) params.Set(URL_FRESHFOOD_PARA_ORDERSTATUSTIME, statusTime) @@ -216,7 +216,7 @@ func (f *API) ELMOrderStatus(orderId string, status int, statusTime string) erro func (f *API) ELMClientUrgeOrder(orderId string) error { return nil // params := make(url.Values) - // params.Set(URL_FRESHFOOD_PARA_VENDERID, utils.Int2Str(controllers.ELM_VENDERID)) + // params.Set(URL_FRESHFOOD_PARA_VENDORID, utils.Int2Str(controllers.ELM_VENDORID)) // params.Set(URL_FRESHFOOD_PARA_ORDERID, orderId) // return f.AccessFreshFood(URL_FRESHFOOD_ELEME_USER_URGE_ORDER, params) diff --git a/legacy/jd/controller/order.go b/legacy/jd/controller/order.go index 3a3c55ee7..661fdfbd5 100644 --- a/legacy/jd/controller/order.go +++ b/legacy/jd/controller/order.go @@ -142,7 +142,7 @@ func (c *OrderController) OrderDeliveryStatus(jdOrderDeliveryStatusMsg *jdapi.Ca //----------- func OnNewOrder(msg *jdapi.CallbackOrderMsg, userMobile string, db orm.Ormer) { - controllers.OnNewOrder(msg.BillID, controllers.JD_VENDERID, userMobile, 0, db, func(acceptIt bool) { + controllers.OnNewOrder(msg.BillID, controllers.JD_VENDORID, userMobile, 0, db, func(acceptIt bool) { globals.SugarLogger.Infof("OrderAcceptOperate billid:%v, acceptIt:%v", msg.BillID, acceptIt) api.Jdapi.OrderAcceptOperate(msg.BillID, acceptIt) })