diff --git a/business/lakala/lakala_incoming.go b/business/lakala/lakala_incoming.go index ab95cd305..1fc1b4138 100644 --- a/business/lakala/lakala_incoming.go +++ b/business/lakala/lakala_incoming.go @@ -65,6 +65,15 @@ func GetMerchantInfo(merchantNo string) (*lakala.MerchantObj, error) { return result, err } +// GetPosTerimeInfo 获取门店商户详情 +func GetPosTerimeInfo(posSn string) (*lakala.TerminalInfo, error) { + result, err := api.LaKaLaApi.GetTerminalInfo(posSn) + if err != nil { + return nil, err + } + return result, err +} + // QueryCityCode 获取拉卡拉code列表 func QueryCityCode(parentCode string) ([]*lakala.OrganizationList, error) { return api.LaKaLaApi.GetOrganizationCode(parentCode) diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go index 560f2a419..32ad7684a 100644 --- a/business/partner/purchase/ebai/store_sku2.go +++ b/business/partner/purchase/ebai/store_sku2.go @@ -231,7 +231,7 @@ func (p *PurchaseHandler) updateStoreSkus(ctx *jxcontext.Context, storeID int, v if strings.Contains(storeSku.StoreName, model.ExdStoreName) { isExd = true } - params := genSkuParamsFromStoreSkuInfo2(storeSku, false, isExd) + params := genSkuParamsFromStoreSkuInfo2(storeSku, false, true) if globals.EnableEbaiStoreWrite { _, err = api.EbaiAPI.SkuUpdate(ctx.GetTrackInfo(), strStoreID, utils.Str2Int64(storeSku.VendorSkuID), params) if err != nil { @@ -283,7 +283,7 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v isExd = false customSkuID = int64(storeSku.SkuID) } - params := genSkuParamsFromStoreSkuInfo2(storeSku, true, isExd) + params := genSkuParamsFromStoreSkuInfo2(storeSku, true, true) if globals.EnableEbaiStoreWrite { strStoreID := utils.Int2Str(storeID) if vendorSkuID, err = api.EbaiAPI.SkuCreate(ctx.GetTrackInfo(), strStoreID, customSkuID, params); err == nil && !isExd { diff --git a/controllers/lakala.go b/controllers/lakala.go index bd2783f89..eeaf6543d 100644 --- a/controllers/lakala.go +++ b/controllers/lakala.go @@ -47,6 +47,21 @@ func (c *LaKaLaController) GetMerchant() { }) } +// GetPosTerminalInfo 获取终端详情 +// @Title 获取终端详情 +// @Description 获取终端详情 +// @Param token header string true "认证token" +// @Param posSN query string true "机具号" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /GetPosTerminalInfo [get] +func (c *LaKaLaController) GetPosTerminalInfo() { + c.callGetPosTerminalInfo(func(params *tLakalaGetPosTerminalInfoParams) (retVal interface{}, errCode string, err error) { + retVal, err = lakalaServer.GetPosTerimeInfo(params.PosSN) + return + }) +} + // QueryCityCode 获取拉卡拉城市code // @Title 获取拉卡拉城市code // @Description 获取拉卡拉城市code diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 0ca2784e6..14fdbef6d 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -4816,6 +4816,15 @@ func init() { MethodParams: param.Make(), Filters: nil, Params: nil}) + // 获取终端详细信息 + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:LaKaLaController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:LaKaLaController"], + web.ControllerComments{ + Method: "GetPosTerminalInfo", + Router: `/GetPosTerminalInfo`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) // 营业执照变更 web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:LaKaLaController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:LaKaLaController"], web.ControllerComments{