diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 84fbce64a..aae0acea1 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -3314,9 +3314,9 @@ func GetSkuNamesNew(ctx *jxcontext.Context, keyword string, skuIDs, skuNameIDs [ for _, v := range skus { var things []*model.ThingMap sql := ` - SELECT * FROM thing_map WHERE thing_type = ? AND thing_id = ? AND vendor_thing_id <> "" AND deleted_at = ? + SELECT * FROM thing_map WHERE thing_id = ? AND vendor_thing_id <> "" AND thing_type = ? AND vendor_org_code IN (?,?) AND deleted_at = ? ` - sqlParams := []interface{}{model.ThingTypeSku, v.ID, utils.DefaultTimeValue} + sqlParams := []interface{}{v.ID, model.ThingTypeSku, "320406", "379599", utils.DefaultTimeValue} // 京东到家菜市,果切 dao.GetRows(db, &things, sql, sqlParams) skusVendor := &model.SkuWithVendor{ Sku: v, diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index b5b024ab9..a51b67d05 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -2392,9 +2392,15 @@ func ExportShopsHealthInfo(ctx *jxcontext.Context, vendorIDs, storeIDs []int, is return hint, err } -func GetCorporationInfo(ctx *jxcontext.Context, licenceCode string) (corporationInfo *jdapi.CorporationInfo, err error) { +func GetCorporationInfo(ctx *jxcontext.Context, licenceCode, licenceImg string) (corporationInfo *jdapi.GetOrderDetailByLicenseImg, err error) { // 门店ID随便一个合法的京东门店ID就可以 - corporationInfo, err = api.JdAPI.GetCorporationInfo("11734851", licenceCode) + jdImg, err := api.JdAPI.StoreUploadImgByURL(licenceImg) + if err != nil { + return nil, err + } + corporationInfo, err = api.JdAPI.GetCorporationInfo2(jdImg) + // 下面的方法无法使用,找不到出处 + // corporationInfo, err = api.JdAPI.GetCorporationInfo("11734851", licenceCode) return corporationInfo, err } diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 030674713..e50285675 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -428,12 +428,13 @@ func (c *StoreController) ExportShopsHealthInfo() { // @Description 得到工商执照企业信息 // @Param token header string true "认证token" // @Param licenceCode query string true "营业执照号" +// @Param licenceImg query string true "营业执图片" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /GetCorporationInfo [get] func (c *StoreController) GetCorporationInfo() { c.callGetCorporationInfo(func(params *tStoreGetCorporationInfoParams) (retVal interface{}, errCode string, err error) { - retVal, err = cms.GetCorporationInfo(params.Ctx, params.LicenceCode) + retVal, err = cms.GetCorporationInfo(params.Ctx, params.LicenceCode, params.LicenceImg) return retVal, "", err }) }