diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 4b92fdae5..3647f2ae2 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -174,7 +174,7 @@ func SyncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag func SyncStoreSkuNew2(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag int, vendorID, storeID int, vendorStoreID, vendorOrgCode string, nameIDs, skuIDs, excludeSkuIDs []int, useVendorPriceDirectly, isAsync, isContinueWhenError bool) (hint string, err error) { singleStoreHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler) - if singleStoreHandler != nil { + if singleStoreHandler != nil && vendorID != model.VendorIDJDShop { if err = CreateStoreCategoryByStoreSku(ctx, vendorID, storeID, vendorStoreID, nameIDs, skuIDs); err != nil { return "", err } @@ -183,7 +183,7 @@ func SyncStoreSkuNew2(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFla func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { switch step { case 0: - if singleStoreHandler != nil { + if singleStoreHandler != nil && vendorID != model.VendorIDJDShop { _, err = SyncStoreCategories(ctx, task, vendorID, storeID, vendorStoreID, nameIDs, skuIDs, false, isContinueWhenError) } case 1: diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go index 5ec8fa472..cdb06e363 100644 --- a/business/partner/purchase/ebai/store.go +++ b/business/partner/purchase/ebai/store.go @@ -644,5 +644,146 @@ func (p *PurchaseHandler) DeleteStore(db *dao.DaoDB, storeID int, userName strin } func (c *PurchaseHandler) SyncQualify(ctx *jxcontext.Context, storeDetail *dao.StoreDetail) (err error) { + if storeDetail.LicenceCode == "" || storeDetail.Licence == "" { + return fmt.Errorf("营业执照信息不全, [%v]", storeDetail.ID) + } + if storeDetail.IDCode == "" || storeDetail.IDCardFront == "" || storeDetail.IDCardBack == "" || storeDetail.IDValid == "" { + return fmt.Errorf("个人信息不全, [%v]", storeDetail.ID) + } + if storeDetail.StoreFrontPic == "" || storeDetail.StoreInPic == "" { + return fmt.Errorf("门面门店照必须不全!, [%v]", storeDetail.ID) + } + if storeDetail.Licence2Code == "" || storeDetail.Licence2Image == "" { + return fmt.Errorf("食品经营许可证不全, [%v]", storeDetail.ID) + } + + //营业执照 + licenceMap := make(map[string]interface{}) + licenceMap["type_1"] = 1 + licenceMap["type_2"] = 101 + licenceMap["license_number"] = storeDetail.LicenceCode + licenceMap["license_address"] = storeDetail.LicenceAddress + licenceMap["legal_representative_name"] = storeDetail.LicenceOwnerName + licenceMap["license_name"] = storeDetail.LicenceCorpName + licenceMap["photos"] = []map[string]interface{}{ + map[string]interface{}{ + "photo_url": storeDetail.Licence, + "waterprinter_url": storeDetail.Licence, + }, + } + if storeDetail.LicenceExpire == "" { + licenceMap["long_term_valid"] = 1 + } else { + if storeDetail.LicenceValid != "" { + if utils.Str2Time(storeDetail.LicenceExpire).Sub(utils.Str2Time(storeDetail.LicenceValid)) > 0 { + licenceMap["license_validdate"] = storeDetail.LicenceExpire + } else { + licenceMap["license_validdate"] = storeDetail.LicenceValid + } + } else { + licenceMap["license_validdate"] = storeDetail.LicenceExpire + } + } + + //食品经营许可证 + licence2Map := make(map[string]interface{}) + licence2Map["type_1"] = 2 + licence2Map["type_2"] = 202 + licence2Map["license_number"] = storeDetail.Licence2Code + licence2Map["license_address"] = storeDetail.LicenceAddress + licence2Map["legal_representative_name"] = storeDetail.LicenceOwnerName + licence2Map["license_name"] = storeDetail.LicenceCorpName + licence2Map["photos"] = []map[string]interface{}{ + map[string]interface{}{ + "photo_url": storeDetail.Licence2Image, + "waterprinter_url": storeDetail.Licence2Image, + }, + } + if storeDetail.Licence2Expire == "" { + licence2Map["long_term_valid"] = 1 + } else { + if storeDetail.Licence2Valid != "" { + if utils.Str2Time(storeDetail.Licence2Expire).Sub(utils.Str2Time(storeDetail.Licence2Valid)) > 0 { + licence2Map["license_validdate"] = storeDetail.Licence2Expire + } else { + licence2Map["license_validdate"] = storeDetail.Licence2Valid + } + } else { + licence2Map["license_validdate"] = storeDetail.Licence2Expire + } + } + + //身份证 + idMap := make(map[string]interface{}) + idMap["type_1"] = 3 + idMap["type_2"] = 301 + idMap["license_number"] = storeDetail.IDCode + idMap["legal_representative_name"] = storeDetail.IDName + idMap["license_name"] = storeDetail.IDName + idMap["photos"] = []map[string]interface{}{ + map[string]interface{}{ + "photo_url": storeDetail.Licence2Image, + "waterprinter_url": storeDetail.Licence2Image, + }, + } + if storeDetail.Licence2Expire == "" { + idMap["long_term_valid"] = 1 + } else { + if storeDetail.Licence2Valid != "" { + if utils.Str2Time(storeDetail.Licence2Expire).Sub(utils.Str2Time(storeDetail.Licence2Valid)) > 0 { + idMap["license_validdate"] = storeDetail.Licence2Expire + } else { + idMap["license_validdate"] = storeDetail.Licence2Valid + } + } else { + idMap["license_validdate"] = storeDetail.Licence2Expire + } + } + + params := make(map[string]interface{}) + var maps []map[string]interface{} + maps = append(maps, licenceMap) + maps = append(maps, licence2Map) + maps = append(maps, map[string]interface{}{ + "type_1": 5, + "type_2": 501, + "photos": []map[string]interface{}{ + map[string]interface{}{ + "photo_url": storeDetail.StoreFrontPic, + "waterprinter_url": storeDetail.StoreFrontPic, + }, + }, + }, map[string]interface{}{ + "type_1": 5, + "type_2": 502, + "photos": []map[string]interface{}{ + map[string]interface{}{ + "photo_url": storeDetail.StoreInPic, + "waterprinter_url": storeDetail.StoreInPic, + }, + }, + }) + params["aptitude"] = maps + params["aptitude"] = []map[string]interface{}{ + map[string]interface{}{ + "type_1": 3, + "type_2": 301, + "license_number": "510921196608255211", + "long_term_valid": 1, + "license_name": "身份证", + "legal_representative_name": "张应友", + "photos": []map[string]interface{}{ + map[string]interface{}{ + "photo_url": "http://image.jxc4.com/image/ebdaf32e771a6c050e397624c3fae369.jpg", + "waterprinter_url": "http://image.jxc4.com/image/ebdaf32e771a6c050e397624c3fae369.jpg", + }, + map[string]interface{}{ + "photo_url": "http://image.jxc4.com/image/75fad719d61326cedd73f17b1af6338b.jpg", + "waterprinter_url": "http://image.jxc4.com/image/75fad719d61326cedd73f17b1af6338b.jpg", + }, + }, + }, + } + err = api.EbaiAPI.ShopAptitudeUpload("", utils.Str2Int64(storeDetail.VendorStoreID), params) return err }