From 19fb3812c94c66f138d0e933c4e4b36b27c35962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 10 Jan 2023 16:27:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E4=BF=A1=E6=81=AF,=E6=A0=B9=E6=8D=AE=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=97=A8=E5=BA=97=E8=AF=A6=E7=BB=86{?= =?UTF-8?q?=E4=BA=AC=E4=B8=9C}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 10 ++++++++-- controllers/cms_store.go | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) 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 }) } From 6c52d2267354301a37a396e39c9a74fc8c384499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 10 Jan 2023 17:41:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=A9=E5=81=87=E6=9E=9C=E5=88=87thingma?= =?UTF-8?q?p=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sku.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 84fbce64a..c51dafa15 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 (?,?) deleted_at = ? ` - sqlParams := []interface{}{model.ThingTypeSku, v.ID, utils.DefaultTimeValue} + sqlParams := []interface{}{v.ID, model.ThingTypeSku, utils.DefaultTimeValue, "320406", "379599"} // 京东到家菜市,果切 dao.GetRows(db, &things, sql, sqlParams) skusVendor := &model.SkuWithVendor{ Sku: v, From 775c3523565a7b7478b211a5e0b1b8463e2d9b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 10 Jan 2023 17:41:35 +0800 Subject: [PATCH 3/4] 1 --- business/jxstore/cms/sku.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index c51dafa15..ccd469350 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -3316,7 +3316,7 @@ func GetSkuNamesNew(ctx *jxcontext.Context, keyword string, skuIDs, skuNameIDs [ sql := ` SELECT * FROM thing_map WHERE thing_id = ? AND vendor_thing_id <> "" AND thing_type = ? AND vendor_org_code IN (?,?) deleted_at = ? ` - sqlParams := []interface{}{v.ID, model.ThingTypeSku, utils.DefaultTimeValue, "320406", "379599"} // 京东到家菜市,果切 + sqlParams := []interface{}{v.ID, model.ThingTypeSku, "320406", "379599", utils.DefaultTimeValue} // 京东到家菜市,果切 dao.GetRows(db, &things, sql, sqlParams) skusVendor := &model.SkuWithVendor{ Sku: v, From eac573c4c969e7402884f5f07bc015eb6bbe68fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 10 Jan 2023 17:43:40 +0800 Subject: [PATCH 4/4] 1 --- business/jxstore/cms/sku.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index ccd469350..aae0acea1 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -3314,7 +3314,7 @@ func GetSkuNamesNew(ctx *jxcontext.Context, keyword string, skuIDs, skuNameIDs [ for _, v := range skus { var things []*model.ThingMap sql := ` - SELECT * FROM thing_map WHERE thing_id = ? AND vendor_thing_id <> "" AND thing_type = ? AND vendor_org_code IN (?,?) 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{}{v.ID, model.ThingTypeSku, "320406", "379599", utils.DefaultTimeValue} // 京东到家菜市,果切 dao.GetRows(db, &things, sql, sqlParams)