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

- change all vender to vendor.

Browse Source
This commit is contained in:
gazebo
2018-07-08 18:46:32 +08:00
parent 70540dfa41
commit 49ec11baf8
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/controllers/business.go
View File

@@ -7,11 +7,11 @@ import (
) )
const ( const (
JD_VENDERID = 0 JD_VENDORID = 0
ELM_VENDERID = 2 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 handleType := 0
if userMobile != "" { if userMobile != "" {
if db == nil { 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 := db.Read(user, "Mobile"); err != nil {
if err != orm.ErrNoRows { 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 handleType = 1
} else { } 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 handleType = -1
} }
} else { } 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 handleType = 1
} }

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

@@ -54,7 +54,7 @@ func (o *OrderController) OrderMessage(msg *elmapi.CallbackMsg) (retVal *elmapi.
} }
func OnNewOrder(orderID string, userMobile string) { 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 { if acceptIt {
api.ElmAPI.ConfirmOrder(orderID) api.ElmAPI.ConfirmOrder(orderID)
} else { } else {

10
legacy/freshfood/freshfood.go
View File

@@ -36,7 +36,7 @@ const (
const ( const (
URL_FRESHFOOD_PARA_JDORDER = "jdOrder" URL_FRESHFOOD_PARA_JDORDER = "jdOrder"
URL_FRESHFOOD_PARA_VENDERID = "venderId" URL_FRESHFOOD_PARA_VENDORID = "venderId"
URL_FRESHFOOD_PARA_ORDERID = "orderId" URL_FRESHFOOD_PARA_ORDERID = "orderId"
URL_FRESHFOOD_PARA_ORDERSTATUS = "orderStatus" URL_FRESHFOOD_PARA_ORDERSTATUS = "orderStatus"
URL_FRESHFOOD_PARA_ORDERSTATUSTIME = "orderStatusTime" 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 { func (f *API) JDOrderStatus(msg *jdapi.CallbackOrderMsg) error {
params := make(url.Values) 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_ORDERID, msg.BillID)
params.Set(URL_FRESHFOOD_PARA_ORDERSTATUS, msg.StatusID) params.Set(URL_FRESHFOOD_PARA_ORDERSTATUS, msg.StatusID)
params.Set(URL_FRESHFOOD_PARA_ORDERSTATUSTIME, msg.Timestamp) params.Set(URL_FRESHFOOD_PARA_ORDERSTATUSTIME, msg.Timestamp)
@@ -180,7 +180,7 @@ func (f *API) JDOrderDeliveryStatus(jdOrderDeliveryStatusMsg *jdapi.CallbackDeli
params := make(url.Values) params := make(url.Values)
cityName := "all" 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_ORDERID, jdOrderDeliveryStatusMsg.OrderID)
params.Set(URL_FRESHFOOD_PARA_DELIVERYSTATUS, jdOrderDeliveryStatusMsg.DeliveryStatus) params.Set(URL_FRESHFOOD_PARA_DELIVERYSTATUS, jdOrderDeliveryStatusMsg.DeliveryStatus)
params.Set(URL_FRESHFOOD_PARA_DLIVERYSTATUSTIME, jdOrderDeliveryStatusMsg.DeliveryStatusTime) 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 { func (f *API) ELMOrderStatus(orderId string, status int, statusTime string) error {
params := make(url.Values) 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_ORDERID, orderId)
params.Set(URL_FRESHFOOD_PARA_ORDERSTATUS, utils.Int2Str(status)) params.Set(URL_FRESHFOOD_PARA_ORDERSTATUS, utils.Int2Str(status))
params.Set(URL_FRESHFOOD_PARA_ORDERSTATUSTIME, statusTime) 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 { func (f *API) ELMClientUrgeOrder(orderId string) error {
return nil return nil
// params := make(url.Values) // 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_ORDERID, orderId)
// return f.AccessFreshFood(URL_FRESHFOOD_ELEME_USER_URGE_ORDER, params) // return f.AccessFreshFood(URL_FRESHFOOD_ELEME_USER_URGE_ORDER, params)

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

@@ -142,7 +142,7 @@ func (c *OrderController) OrderDeliveryStatus(jdOrderDeliveryStatusMsg *jdapi.Ca
//----------- //-----------
func OnNewOrder(msg *jdapi.CallbackOrderMsg, userMobile string, db orm.Ormer) { 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) globals.SugarLogger.Infof("OrderAcceptOperate billid:%v, acceptIt:%v", msg.BillID, acceptIt)
api.Jdapi.OrderAcceptOperate(msg.BillID, acceptIt) api.Jdapi.OrderAcceptOperate(msg.BillID, acceptIt)
}) })