diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 67c8627a5..278d44236 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -239,14 +239,21 @@ func getStoresSql(ctx *jxcontext.Context, keyword string, params map[string]inte if mapCond := strings.ToUpper(utils.Interface2String(params[mapCondKey])); mapCond == "AND" || mapCond == "OR" { mapCondsStr := utils.Interface2String(params[mapCondKey+"s"]) if mapCondsStr != "" { - var vendorStoreConds map[string]int + var vendorStoreConds map[string]interface{} if err = utils.UnmarshalUseNumber([]byte(mapCondsStr), &vendorStoreConds); err != nil { return "", nil, "", nil, err } sqlVendorStoreCond := "" - for vendor, cond := range vendorStoreConds { + for vendor, cond2 := range vendorStoreConds { + var cond string + if condStr, ok := cond2.(string); !ok { + cond = utils.Int64ToStr(utils.ForceInterface2Int64(cond2)) + } else { + cond = condStr + } + tableAlias := tableName + vendor - if cond != 0 { + if cond != "0" && cond != "" { if sqlVendorStoreCond == "" { if mapCond == "AND" { sqlVendorStoreCond += " AND ( 1 = 1" @@ -258,10 +265,14 @@ func getStoresSql(ctx *jxcontext.Context, keyword string, params map[string]inte tableAlias + ".store_id = t1.id AND " + tableAlias + ".deleted_at = ? AND " + tableAlias + ".is_sync <> 0 " sqlFromParams = append(sqlFromParams, vendor, utils.DefaultTimeValue) - if cond == 1 { + if cond == "1" { sqlVendorStoreCond += " " + mapCond + " " + tableAlias + ".id IS NOT NULL" - } else { + } else if cond == "-1" { sqlVendorStoreCond += " " + mapCond + " " + tableAlias + ".id IS NULL" + } else { + sqlFrom += " AND " + tableAlias + ".vendor_org_code = ?" + sqlFromParams = append(sqlFromParams, cond) + sqlVendorStoreCond += " " + mapCond + " " + tableAlias + ".id IS NOT NULL" } } } diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go index 4fc22b4e6..8f6a55058 100644 --- a/business/jxstore/cms/sync.go +++ b/business/jxstore/cms/sync.go @@ -129,6 +129,13 @@ func (v *VendorSync) syncCategories(ctx *jxcontext.Context, parentTask tasksch.I } func (v *VendorSync) SyncCategory(ctx *jxcontext.Context, db *dao.DaoDB, categoryID int, isAsync bool, userName string) (hint string, err error) { + if !model.IsUseThingMap { + return v.oldSyncCategory(ctx, db, categoryID, isAsync, userName) + } + return SyncCategories(ctx, nil, nil, nil, []int{categoryID}, isAsync) +} + +func (v *VendorSync) oldSyncCategory(ctx *jxcontext.Context, db *dao.DaoDB, categoryID int, isAsync bool, userName string) (hint string, err error) { globals.SugarLogger.Debug("SyncCategory") hint, err = v.LoopMultiStoresVendors(ctx, db, fmt.Sprintf("同步分类信息:%d", categoryID), isAsync, false, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { @@ -158,6 +165,13 @@ func (v *VendorSync) SyncCategory(ctx *jxcontext.Context, db *dao.DaoDB, categor } func (v *VendorSync) SyncReorderCategories(ctx *jxcontext.Context, db *dao.DaoDB, categoryID int, isAsync bool, userName string) (hint string, err error) { + if !model.IsUseThingMap { + return v.oldSyncReorderCategories(ctx, db, categoryID, isAsync, userName) + } + return SyncReorderCategories(ctx, -1, isAsync) +} + +func (v *VendorSync) oldSyncReorderCategories(ctx *jxcontext.Context, db *dao.DaoDB, categoryID int, isAsync bool, userName string) (hint string, err error) { hint, err = v.LoopMultiStoresVendors(ctx, db, fmt.Sprintf("分类重排序:%d", categoryID), isAsync, false, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { vendorInfo := batchItemList[0].(*tMultiStoreVendorInfo) multiStoresHandler := v.GetMultiStoreHandler(vendorInfo.VendorID) @@ -232,6 +246,13 @@ func (v *VendorSync) SyncSku(ctx *jxcontext.Context, db *dao.DaoDB, nameID, skuI } func (v *VendorSync) SyncSkus(ctx *jxcontext.Context, db *dao.DaoDB, nameIDs []int, skuIDs []int, isAsync, isContinueWhenError bool, userName string) (hint string, err error) { + if !model.IsUseThingMap { + return v.oldSyncSkus(ctx, db, nameIDs, skuIDs, isAsync, isContinueWhenError, userName) + } + return SyncSkus(ctx, nil, nil, nil, nameIDs, skuIDs, isAsync) +} + +func (v *VendorSync) oldSyncSkus(ctx *jxcontext.Context, db *dao.DaoDB, nameIDs []int, skuIDs []int, isAsync, isContinueWhenError bool, userName string) (hint string, err error) { globals.SugarLogger.Debugf("SyncSku trackInfo:%s, nameIDs:%v, skuIDs:%v, userName:%s", ctx.GetTrackInfo(), nameIDs, skuIDs, userName) isManagedIt := !(len(nameIDs) > 0 && len(nameIDs) <= 2 || len(skuIDs) > 0 && len(skuIDs) < 8) return v.LoopMultiStoresVendors(ctx, db, fmt.Sprintf("同步商品信息, nameIDs:%v, skuIDs:%v", nameIDs, skuIDs), isAsync, isManagedIt, diff --git a/business/jxutils/datares/datares.go b/business/jxutils/datares/datares.go index 42e3ffb5b..3c5b1486e 100644 --- a/business/jxutils/datares/datares.go +++ b/business/jxutils/datares/datares.go @@ -4,6 +4,7 @@ import ( "bytes" "fmt" "image" + "image/gif" "image/jpeg" "image/png" "net/http" @@ -43,6 +44,8 @@ func Binary2Image(binaryData []byte, mimeType string) (img image.Image, outMimeT img, err = jpeg.Decode(bytes.NewReader(binaryData)) case model.MimeTypePng: img, err = png.Decode(bytes.NewReader(binaryData)) + case model.MimeTypeGif: + img, err = gif.Decode(bytes.NewReader(binaryData)) } return img, mimeType, err } diff --git a/business/model/common.go b/business/model/common.go index c539770f3..e5c3a1d10 100644 --- a/business/model/common.go +++ b/business/model/common.go @@ -9,12 +9,14 @@ const ( MimeTypeJpeg = "image/jpeg" MimeTypePng = "image/png" + MimeTypeGif = "image/gif" ) var ( ValidMimeTypes = map[string]int{ MimeTypeJpeg: 1, MimeTypePng: 1, + MimeTypeGif: 1, } ) diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 1d4e1e6d1..815297fc8 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -265,6 +265,120 @@ func GetDirtyStoreCategories(db *DaoDB, vendorID, storeID int, level int) (cats // 以store_sku_bind为基础来做同步,正常情况下使用 // 单多门店模式厂商通用 func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty bool) (skus []*StoreSkuSyncInfo, err error) { + if !model.IsUseThingMap { + return oldGetStoreSkus2(db, vendorID, storeID, skuIDs, mustDirty) + } + return newGetStoreSkus2(db, vendorID, storeID, skuIDs, mustDirty) +} + +func newGetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty bool) (skus []*StoreSkuSyncInfo, err error) { + if vendorID < 0 { + panic("vendorID<0") + } + isSingleStorePF := model.MultiStoresVendorMap[vendorID] != 1 + fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID]) + skuVendorIDField := fmt.Sprintf("t1.%s_id", fieldPrefix) + if !isSingleStorePF { + skuVendorIDField = "t2m.vendor_thing_id" + } + sql := ` + SELECT + t14.vendor_id, t14.vendor_org_code, + t1.id bind_id, t1.sku_id, t1.price, t1.unit_price, t1.status store_sku_status, + %s vendor_sku_id, t1.%s_sync_status sku_sync_status, t1.%s_price vendor_price, + t1.store_id, t1.deleted_at bind_deleted_at,t1.status_sale_begin,t1.status_sale_end, + t2.*, + t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc, + IF(t11.%s <> '', t11.%s, t3.img) img, + IF(t12.%s <> '', t12.%s, t3.img2) img2, + t13.%s desc_img, + t4.%s_category_id vendor_vendor_cat_id` + fmtParams := []interface{}{ + skuVendorIDField, fieldPrefix, fieldPrefix, + GetDataResFieldName(vendorID), GetDataResFieldName(vendorID), + GetDataResFieldName(vendorID), GetDataResFieldName(vendorID), + GetDataResFieldName(vendorID), + fieldPrefix, + } + if isSingleStorePF { + sql += `, + t5.%s_sync_status cat_sync_status, t5.%s_id vendor_cat_id, + t5sku.%s_sync_status sku_cat_sync_status, t5sku.%s_id sku_vendor_cat_id` + fmtParams = append(fmtParams, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix) + } else { + sql += `, + t4m.vendor_thing_id vendor_cat_id, + t5skum.vendor_thing_id sku_vendor_cat_id` + } + sql += ` + FROM store_sku_bind t1 + LEFT JOIN store_map t14 ON t14.store_id = t1.store_id AND t14.vendor_id = ? AND t14.deleted_at = ? + LEFT JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ? AND t2.status = ? + LEFT JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ? AND t3.status = ? + LEFT JOIN sku_category t4 ON t3.category_id = t4.id AND t4.deleted_at = ? + LEFT JOIN data_resource t11 ON t11.main_url = t3.img + LEFT JOIN data_resource t12 ON t12.main_url = t3.img2 + LEFT JOIN data_resource t13 ON t13.main_url = t3.desc_img + ` + sqlParams := []interface{}{ + vendorID, utils.DefaultTimeValue, + utils.DefaultTimeValue, model.SkuStatusNormal, + utils.DefaultTimeValue, model.SkuStatusNormal, + utils.DefaultTimeValue, + } + if isSingleStorePF { + sql += ` + LEFT JOIN store_sku_category_map t5 ON t4.id = t5.category_id AND t5.store_id = t1.store_id AND t5.deleted_at = ? + LEFT JOIN store_sku_category_map t5sku ON t2.category_id = t5sku.category_id AND t5sku.store_id = t1.store_id AND t5sku.deleted_at = ?` + sqlParams = append(sqlParams, utils.DefaultTimeValue, utils.DefaultTimeValue) + } else { + sql += ` + LEFT JOIN sku_category t5sku ON t5sku.id = t2.category_id + LEFT JOIN thing_map t2m ON t2m.thing_id = t1.sku_id AND t2m.vendor_org_code = t14.vendor_org_code AND t2m.thing_type = ? AND t2m.vendor_id = ? AND t2m.deleted_at = ? + LEFT JOIN thing_map t4m ON t4m.thing_id = t3.category_id AND t4m.vendor_org_code = t14.vendor_org_code AND t4m.thing_type = ? AND t4m.vendor_id = ? AND t4m.deleted_at = ? + LEFT JOIN thing_map t5skum ON t5skum.thing_id = t5sku.id AND t5skum.vendor_org_code = t14.vendor_org_code AND t5skum.thing_type = ? AND t5skum.vendor_id = ? AND t5skum.deleted_at = ? + ` + sqlParams = append(sqlParams, + model.ThingTypeSku, vendorID, utils.DefaultTimeValue, + model.ThingTypeCategory, vendorID, utils.DefaultTimeValue, + model.ThingTypeCategory, vendorID, utils.DefaultTimeValue) + } + sql += " WHERE 1 = 1" + if storeID > 0 { + sql += " AND t1.store_id = ?" + sqlParams = append(sqlParams, storeID) + } + if mustDirty { + sql += " AND (t1.%s_sync_status <> 0 OR (%s <> %s AND t3.id IS NULL))" + fmtParams = append(fmtParams, fieldPrefix, skuVendorIDField) + if isSingleStorePF { + fmtParams = append(fmtParams, "0") + } else { + fmtParams = append(fmtParams, "''") + } + } else { + sql += " AND t1.deleted_at = ?" + sqlParams = append(sqlParams, utils.DefaultTimeValue) + } + if len(skuIDs) > 0 { + sql += " AND t1.sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")" + sqlParams = append(sqlParams, skuIDs) + } + // 多门店平台没有成功创建的商品,不直接过滤,让上层同步时报错 + // if !isSingleStorePF { + // sql += " AND t2.%s_id <> 0" + // fmtParams = append(fmtParams, fieldPrefix) + // } + sql = fmt.Sprintf(sql, fmtParams...) + sql += " ORDER BY t1.price" + // globals.SugarLogger.Debug(sql) + if err = GetRows(db, &skus, sql, sqlParams...); err != nil { + return nil, err + } + return skus, err +} + +func oldGetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty bool) (skus []*StoreSkuSyncInfo, err error) { if vendorID < 0 { panic("vendorID<0") } @@ -364,12 +478,75 @@ func GetStoreSkus(db *DaoDB, vendorID, storeID int, skuIDs []int) (skus []*Store // 以sku为基础来做全同步, // 多门店模式厂商适用 func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInfo, err error) { + if !model.IsUseThingMap { + return oldGetFullStoreSkus(db, vendorID, storeID) + } + return newGetFullStoreSkus(db, vendorID, storeID) +} + +func newGetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInfo, err error) { globals.SugarLogger.Debugf("GetFullStoreSkus, storeID:%d, vendorID:%d", storeID, vendorID) sql := ` - SELECT t1.id bind_id, t1.price, t1.unit_price, t1.status store_sku_status, t2.%s_id vendor_sku_id, + SELECT t1.id bind_id, t1.price, t1.unit_price, t1.status store_sku_status, t1.%s_sync_status sku_sync_status, t1.store_id, t1.deleted_at bind_deleted_at, - t2.*, t2.id sku_id, + t2.*, t2.id sku_id, t2m.vendor_thing_id vendor_sku_id, + t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc, + IF(t11.%s <> '', t11.%s, t3.img) img, + IF(t12.%s <> '', t12.%s, t3.img2) img2, + t13.%s desc_img, + t4.%s_category_id vendor_vendor_cat_id, + t4m.sync_status cat_sync_status, t4m.vendor_thing_id vendor_cat_id, + t5skum.sync_status sku_cat_sync_status, t5skum.vendor_thing_id sku_vendor_cat_id + FROM sku t2 + LEFT JOIN store_sku_bind t1 ON t1.sku_id = t2.id AND t1.store_id = ? AND t1.deleted_at = ? + LEFT JOIN store_map sm ON sm.store_id = t1.store_id AND sm.vendor_id = ? AND sm.deleted_at = ? + LEFT JOIN thing_map t2m ON t2m.thing_id = t2.id AND t2m.vendor_org_code = sm.vendor_org_code AND t2m.thing_type = ? AND t2m.vendor_id = ? AND t2m.deleted_at = ? + JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ? AND t3.status = ? + JOIN sku_category t4 ON t3.category_id = t4.id AND t4.deleted_at = ? + LEFT JOIN thing_map t4m ON t4m.thing_id = t3.category_id AND t4m.vendor_org_code = sm.vendor_org_code AND t4m.thing_type = ? AND t4m.vendor_id = ? AND t4m.deleted_at = ? + LEFT JOIN sku_category t5sku ON t2.category_id = t5sku.id + LEFT JOIN thing_map t5skum ON t5skum.thing_id = t2.category_id AND t5skum.vendor_org_code = sm.vendor_org_code AND t5skum.thing_type = ? AND t5skum.vendor_id = ? AND t5skum.deleted_at = ? + LEFT JOIN data_resource t11 ON t11.main_url = t3.img + LEFT JOIN data_resource t12 ON t12.main_url = t3.img2 + LEFT JOIN data_resource t13 ON t13.main_url = t3.desc_img + WHERE t2.deleted_at = ? AND t2.status = ? AND t2m.vendor_thing_id <> '' + ORDER BY t1.price DESC` + sqlParams := []interface{}{ + storeID, + utils.DefaultTimeValue, + vendorID, utils.DefaultTimeValue, + model.ThingTypeSku, vendorID, utils.DefaultTimeValue, + utils.DefaultTimeValue, + model.SkuStatusNormal, + utils.DefaultTimeValue, + model.ThingTypeCategory, vendorID, utils.DefaultTimeValue, + model.ThingTypeCategory, vendorID, utils.DefaultTimeValue, + utils.DefaultTimeValue, + model.SkuStatusNormal, + } + fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID]) + sql = fmt.Sprintf(sql, + fieldPrefix, + GetDataResFieldName(vendorID), GetDataResFieldName(vendorID), + GetDataResFieldName(vendorID), GetDataResFieldName(vendorID), + GetDataResFieldName(vendorID), + fieldPrefix) + // globals.SugarLogger.Debug(sql) + // globals.SugarLogger.Debug(utils.Format4Output(sqlParams, false)) + if err = GetRows(db, &skus, sql, sqlParams...); err != nil { + return nil, err + } + return skus, err +} + +func oldGetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInfo, err error) { + globals.SugarLogger.Debugf("GetFullStoreSkus, storeID:%d, vendorID:%d", storeID, vendorID) + + sql := ` + SELECT t1.id bind_id, t1.price, t1.unit_price, t1.status store_sku_status, + t1.%s_sync_status sku_sync_status, t1.store_id, t1.deleted_at bind_deleted_at, + t2.*, t2.id sku_id, t2.%s_id vendor_sku_id, t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc, IF(t11.%s <> '', t11.%s, t3.img) img, IF(t12.%s <> '', t12.%s, t3.img2) img2, diff --git a/business/model/sync_map.go b/business/model/sync_map.go index 5ca1dcbae..3de1b6fae 100644 --- a/business/model/sync_map.go +++ b/business/model/sync_map.go @@ -6,6 +6,10 @@ const ( ThingTypeSku = 3 ) +const ( + IsUseThingMap = false +) + type ThingMap struct { ModelIDCULD diff --git a/controllers/cms.go b/controllers/cms.go index 3d73e6e06..2e9b700fa 100644 --- a/controllers/cms.go +++ b/controllers/cms.go @@ -9,6 +9,7 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils/datares" "git.rosy.net.cn/jx-callback/business/msghub" "git.rosy.net.cn/jx-callback/globals/api" + "git.rosy.net.cn/jx-callback/globals/api/apimanager" "github.com/astaxie/beego" ) @@ -330,3 +331,16 @@ func (c *CmsController) GetCityBankBranches() { return retVal, "", err }) } + +// @Title 得到平台的账号信息 +// @Description 得到平台的账号信息 +// @Param token header string true "认证token" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /GetVendorOrgCodeInfo [get] +func (c *CmsController) GetVendorOrgCodeInfo() { + c.callGetVendorOrgCodeInfo(func(params *tCmsGetVendorOrgCodeInfoParams) (retVal interface{}, errCode string, err error) { + retVal = apimanager.GetVendorOrgCodeMap(params.Ctx) + return retVal, "", err + }) +} diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 59a2cfd3f..01a583c86 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -29,7 +29,7 @@ type StoreController struct { // @Param tel query string false "电话" // @Param statuss query string false "门店状态列表[-1,0,1],(-1:禁用;0:休息,关店;1:正常开店),缺省不限制" // @Param vendorStoreCond query string false "查询关联门店的条件(如果此字段没有设置,vendorStoreConds无效),and:与,or:或,指的是vendorStoreConds里的条件间的关系,这组条件与其它条件都是与的关系" -// @Param vendorStoreConds query string false "为厂商条件对象{vendorID: cond},注意vendorID是字符串形式,cond,-1:没有关联,0:不限定,1:有关联,缺省为0" +// @Param vendorStoreConds query string false "为厂商条件对象{vendorID: cond},注意vendorID是字符串形式,cond,-1:没有关联,0:不限定,1:有关联,缺省为0,其它值表示vendorOrgCode" // @Param courierStoreCond query string false "查询关联门店的条件(如果此字段没有设置,courierStoreConds无效),and:与,or:或,指的是courierStoreConds里的条件间的关系,这组条件与其它条件都是与的关系" // @Param courierStoreConds query string false "为厂商条件对象{vendorID: cond},注意vendorID是字符串形式,cond,-1:没有关联,0:不限定,1:有关联,缺省为0" // @Param mapLongitude query string false "地图中心经度" diff --git a/globals/api/apimanager/apimanager.go b/globals/api/apimanager/apimanager.go index 6f65e4adb..89a0b71ef 100644 --- a/globals/api/apimanager/apimanager.go +++ b/globals/api/apimanager/apimanager.go @@ -2,6 +2,7 @@ package apimanager import ( "git.rosy.net.cn/jx-callback/business/jxutils" + "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals" @@ -69,3 +70,11 @@ func (a *APIManager) GetVendorOrgCodeList(vendorIDs []int, appOrgCodes []string) } return vendorOrgCodeList } + +func GetVendorOrgCodeMap(ctx *jxcontext.Context) (vendorOrgCodeMap map[int][]string) { + vendorOrgCodeMap = make(map[int][]string) + for _, vendorID := range partner.GetPurchasePlatformVendorIDs() { + vendorOrgCodeMap[vendorID] = CurAPIManager.GetAppOrgCodeList(vendorID) + } + return vendorOrgCodeMap +} diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 1a7b18742..2aaab868c 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -304,6 +304,15 @@ func init() { Filters: nil, Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"], + beego.ControllerComments{ + Method: "GetVendorOrgCodeInfo", + Router: `/GetVendorOrgCodeInfo`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"], beego.ControllerComments{ Method: "NewConfig",