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

Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
richboo111
2023-01-11 09:48:03 +08:00
parent d082e518a5 eac573c4c9
commit 2789b854d5
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxstore/cms/sku.go
View File

@@ -3314,9 +3314,9 @@ func GetSkuNamesNew(ctx *jxcontext.Context, keyword string, skuIDs, skuNameIDs [
for _, v := range skus { for _, v := range skus {
var things []*model.ThingMap var things []*model.ThingMap
sql := ` 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) dao.GetRows(db, &things, sql, sqlParams)
skusVendor := &model.SkuWithVendor{ skusVendor := &model.SkuWithVendor{
Sku: v, Sku: v,

10
business/jxstore/cms/store.go
View File

@@ -2392,9 +2392,15 @@ func ExportShopsHealthInfo(ctx *jxcontext.Context, vendorIDs, storeIDs []int, is
return hint, err 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就可以 // 门店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 return corporationInfo, err
} }

3
controllers/cms_store.go
View File

@@ -428,12 +428,13 @@ func (c *StoreController) ExportShopsHealthInfo() {
// @Description 得到工商执照企业信息 // @Description 得到工商执照企业信息
// @Param token header string true "认证token" // @Param token header string true "认证token"
// @Param licenceCode query string true "营业执照号" // @Param licenceCode query string true "营业执照号"
// @Param licenceImg query string true "营业执图片"
// @Success 200 {object} controllers.CallResult // @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult
// @router /GetCorporationInfo [get] // @router /GetCorporationInfo [get]
func (c *StoreController) GetCorporationInfo() { func (c *StoreController) GetCorporationInfo() {
c.callGetCorporationInfo(func(params *tStoreGetCorporationInfoParams) (retVal interface{}, errCode string, err error) { 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 return retVal, "", err
}) })
} }