diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 7d4b263e9..d9131d22b 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -50,7 +50,7 @@ var ( "21:30:00", } dailyWorkTimeList2 = []string{ - "09:30:00", + "02:30:00", } priceReferTimeList = []string{ "03:00:00", diff --git a/business/partner/purchase/ebai/ebai.go b/business/partner/purchase/ebai/ebai.go index de7853796..87d00fe51 100644 --- a/business/partner/purchase/ebai/ebai.go +++ b/business/partner/purchase/ebai/ebai.go @@ -158,5 +158,36 @@ func (p *PurchaseHandler) GetVendorCategories(ctx *jxcontext.Context) (vendorCat } func (p *PurchaseHandler) GetOrderRider(vendorOrgCode, vendorStoreID string, param map[string]interface{}) (err error) { - return api.EbaiAPI.OrderselfDeliveryStateSync(param["order_id"].(string), param["courier_phone"].(string)) + selfStatus := 0 + switch param["logistics_status"].(int) { + case 0: + selfStatus = 2 // 2:配送待分配 + case 12: + selfStatus = 3 // 骑士接单 + case 15: + selfStatus = 8 // 骑士到店 + case 20: + selfStatus = 20 // 骑手送出 + case 40: + selfStatus = 30 // 配送完成 + default: + selfStatus = 7 // 配送异常 + } + param2 := &ebaiapi.PushRiderInfo{ + DistributorId: 201, + OrderId: param["order_id"].(string), + State: 21, + SelfStatus: selfStatus, + SelfStatusDesc: param["logistics_context"].(string), + DistributorInfoDTO: ebaiapi.DistributorInfoDTO{ + DistributorTypeId: "99999", + DistributorName: "商家自行配送", + }, + Knight: ebaiapi.Knight{ + Id: param["order_id"].(int64), + Name: param["courier_name"].(string), + Phone: param["courier_phone"].(string), + }, + } + return api.EbaiAPI.OrderselfDeliveryStateSync2(param2) } diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go index b70369015..36c3d0008 100644 --- a/controllers/cms_store_sku.go +++ b/controllers/cms_store_sku.go @@ -2,6 +2,7 @@ package controllers import ( "git.rosy.net.cn/baseapi/platformapi/jdapi" + "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/auth2" "git.rosy.net.cn/jx-callback/business/model" @@ -1039,3 +1040,18 @@ func (c *StoreSkuController) CopyMtToJd() { return retVal, "", err }) } + +// @Title 美团门店复制到美团 +// @Description 美团门店复制到美团 +// @Param token header string true "认证token" +// @Param fromStoreID formData string true "被复制门店id" +// @Param toStoreID formData string true "复制到门店id" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /CopyMtToMt [post] +func (c *StoreSkuController) CopyMtToMt() { + c.callCopyMtToMt(func(params *tStoreSkuCopyMtToMtParams) (retVal interface{}, errCode string, err error) { + retVal, err = cms.CopyOnStoreSkuToOther(params.Ctx, utils.Str2Int(params.FromStoreID), utils.Str2Int(params.ToStoreID), false) + return retVal, errCode, err + }) +} diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index ae493ebdf..2d32cee6a 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -3218,6 +3218,15 @@ func init() { Filters: nil, Params: nil}) + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"], + web.ControllerComments{ + Method: "CopyMtToMt", + Router: `/CopyMtToMt`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"], web.ControllerComments{ Method: "GetStoresSkusSaleInfo",