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

Accept Merge Request #213: (qidongsheng -> jdshop)

Browse Source 
Merge Request: 修改对比方法和美团配送状态方法的调用
Created By: @漆东升
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/213
This commit is contained in:
苏尹岚
2020-07-02 15:44:20 +08:00
parent b3943c687d 74b48efba2
commit c7303c62d2
2 changed files with 62 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
business/jxstore/cms/store_sku_check.go
View File

@@ -363,14 +363,8 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin
/*写京西skuIDStr*/ /*写京西skuIDStr*/
//utils.Writelog("skuIDStr" + skuIDStr) //utils.Writelog("skuIDStr" + skuIDStr)
var jxSkuDetailName string var jxSkuDetailName string
//多规格商品不用比较数量单位 //jxSkuDetailName : 前缀 ([荐]) + 分类名(xxx水饺) + 数量单位(约..g/份) + 注释 (补充..)
if jxSkuInfo.IsSpu == 0 { jxSkuDetailName = jxutils.ComposeSkuNameOriginal(jxSkuInfo.SkuName.Prefix, jxSkuInfo.SkuName.Name, jxSkuInfo.Skus[0].Comment, jxSkuInfo.SkuName.Unit, jxSkuInfo.Skus[0].SkuSpecQuality, jxSkuInfo.Skus[0].SkuSpecUnit, 0)
//jxSkuDetailName : 前缀 ([荐]) + 分类名(xxx水饺) + 数量单位(约..g/份) + 注释 (补充..)
jxSkuDetailName = jxutils.ComposeSkuNameOriginal(jxSkuInfo.SkuName.Prefix, jxSkuInfo.SkuName.Name, jxSkuInfo.Skus[0].Comment, jxSkuInfo.SkuName.Unit, jxSkuInfo.Skus[0].SkuSpecQuality, jxSkuInfo.Skus[0].SkuSpecUnit, 0)
} else {
//jxSkuDetailName : 前缀 ([荐]) + 分类名(xxx水饺) + 数量单位(约..g/份) + 注释 (补充..)
jxSkuDetailName = jxutils.ComposeSkuNameOriginal(jxSkuInfo.SkuName.Prefix, jxSkuInfo.SkuName.Name, jxSkuInfo.Skus[0].Comment, "", jxSkuInfo.Skus[0].SkuSpecQuality, "", 0)
}
//utils.Writelog("jxSkuDetailName:" + jxSkuDetailName) //utils.Writelog("jxSkuDetailName:" + jxSkuDetailName)
//jxSkuSaleStatus : 商品状态 ，skustatus 优先级高于 StoreSkuStatus //jxSkuSaleStatus : 商品状态 ，skustatus 优先级高于 StoreSkuStatus
jxSkuSaleStatus := jxutils.MergeSkuStatus(jxSkuInfo.Skus[0].SkuStatus, jxSkuInfo.Skus[0].StoreSkuStatus) jxSkuSaleStatus := jxutils.MergeSkuStatus(jxSkuInfo.Skus[0].SkuStatus, jxSkuInfo.Skus[0].StoreSkuStatus)
@@ -608,7 +602,7 @@ func StoreOpenAll(ctx *jxcontext.Context) {
/* 美团配送的门店是否存在，调用美团配送的api（有可能接了），查询京西门店对应的美团配送门店是否存在，若不存在则要在京西这边解绑美团配送门店 /* 美团配送的门店是否存在，调用美团配送的api（有可能接了），查询京西门店对应的美团配送门店是否存在，若不存在则要在京西这边解绑美团配送门店
怎么解绑可以在网页上门店管理那点一下看看调的什么接口，传的什么参数*/ 怎么解绑可以在网页上门店管理那点一下看看调的什么接口，传的什么参数*/
/*获取所有门店信息*/ /*获取所有门店信息*/
test: //test:
for _, StoreCourierList1 := range StoreCourierList { for _, StoreCourierList1 := range StoreCourierList {
diff := false diff := false
StoreLists, _ := dao.GetStoreList(db, []int{StoreCourierList1.StoreID}, nil, nil, nil, "") StoreLists, _ := dao.GetStoreList(db, []int{StoreCourierList1.StoreID}, nil, nil, nil, "")
@@ -648,7 +642,7 @@ test:
globals.SugarLogger.Debug(err.Error()) globals.SugarLogger.Debug(err.Error())
return return
} }
break test //break test
} }
} }
globals.SugarLogger.Debug("StoreOpenAll skuID is Complete") globals.SugarLogger.Debug("StoreOpenAll skuID is Complete")
@@ -807,7 +801,7 @@ test:
//} //}
//} //}
//}func StoreOpenAll(ctx *jxcontext.Context) { //func StoreOpenAll(ctx *jxcontext.Context) {
// db := dao.GetDB() // db := dao.GetDB()
// StoreLists, err := dao.GetStoreList(db, nil, nil, []int{1}, nil, "") // StoreLists, err := dao.GetStoreList(db, nil, nil, []int{1}, nil, "")
// if err != nil { // if err != nil {
@@ -951,58 +945,61 @@ func TestDiff(ctx *jxcontext.Context, vendorIDList []int, storeIDList []int) {
//获取总共几个门店任务 //获取总共几个门店任务
filterStoreList := GetFilterStoreList(jxStoreInfoList.Stores, vendorMap, storeIDMap) filterStoreList := GetFilterStoreList(jxStoreInfoList.Stores, vendorMap, storeIDMap)
diffData.InitData() diffData.InitData()
jxStoreInfoListValue := filterStoreList[0] for i := range filterStoreList {
storeID := jxStoreInfoListValue.ID jxStoreInfoListValue := filterStoreList[i]
storeIDStr := utils.Int2Str(storeID) storeID := jxStoreInfoListValue.ID
storeName := jxStoreInfoListValue.Name storeIDStr := utils.Int2Str(storeID)
jxSkuInfoDataSingle := &dao.StoreSkuNamesInfo{} storeName := jxStoreInfoListValue.Name
jxSkuInfoDataMulti := &dao.StoreSkuNamesInfo{} jxSkuInfoDataSingle := &dao.StoreSkuNamesInfo{}
if jxStoreInfoListValue.StoreMaps != nil { jxSkuInfoDataMulti := &dao.StoreSkuNamesInfo{}
var multiFlag = false if jxStoreInfoListValue.StoreMaps != nil {
var singleFlag = false var multiFlag = false
var filterJxSkuInfoMapSingle map[int]*dao.StoreSkuNameExt var singleFlag = false
var filterJxSkuInfoMapMulti map[int]*dao.StoreSkuNameExt var filterJxSkuInfoMapSingle map[int]*dao.StoreSkuNameExt
for _, vendorListValue := range jxStoreInfoListValue.StoreMaps { var filterJxSkuInfoMapMulti map[int]*dao.StoreSkuNameExt
vendorID := vendorListValue.VendorID for _, vendorListValue := range jxStoreInfoListValue.StoreMaps {
if partner.IsMultiStore(vendorID) { vendorID := vendorListValue.VendorID
if multiFlag == false { if partner.IsMultiStore(vendorID) {
jxSkuInfoDataMulti, _ = GetStoreSkus(ctx, storeID, filterJxDepotUnSaleSkuIds, true, "", true, false, map[string]interface{}{}, 0, -1) if multiFlag == false {
/*重新计算价格*/ jxSkuInfoDataMulti, _ = GetStoreSkus(ctx, storeID, filterJxDepotUnSaleSkuIds, true, "", true, false, map[string]interface{}{}, 0, -1)
SetJxPrice(jxSkuInfoDataMulti, storeID) /*重新计算价格*/
filterJxSkuInfoMapMulti = GetFilterJxSkuInfoMap(jxSkuInfoDataMulti.SkuNames) //map[京西商品ID:StoreSkuNameExt] SetJxPrice(jxSkuInfoDataMulti, storeID, vendorID)
multiFlag = true filterJxSkuInfoMapMulti = GetFilterJxSkuInfoMap(jxSkuInfoDataMulti.SkuNames) //map[京西商品ID:StoreSkuNameExt]
multiFlag = true
}
} else {
if singleFlag == false {
jxSkuInfoDataSingle, _ = GetStoreSkus(ctx, storeID, nil, true, "", true, false, map[string]interface{}{}, 0, -1)
/*重新计算价格*/
SetJxPrice(jxSkuInfoDataSingle, storeID, vendorID)
filterJxSkuInfoMapSingle = GetFilterJxSkuInfoMap(jxSkuInfoDataSingle.SkuNames) //map[京西商品ID:StoreSkuNameExt]
singleFlag = true
}
} }
} else { vendorStoreID := vendorListValue.VendorStoreID
if singleFlag == false { baseapi.SugarLogger.Debugf("CheckSkuDiffBetweenJxAndVendor storeID:%d vendorID:%d vendorStoreID:%s vendorListValue:%v", storeID, vendorID, vendorStoreID, vendorListValue)
jxSkuInfoDataSingle, _ = GetStoreSkus(ctx, storeID, nil, true, "", true, false, map[string]interface{}{}, 0, -1)
filterJxSkuInfoMapSingle = GetFilterJxSkuInfoMap(jxSkuInfoDataSingle.SkuNames) //map[京西商品ID:StoreSkuNameExt]
singleFlag = true
}
}
vendorStoreID := vendorListValue.VendorStoreID if partner.IsMultiStore(vendorID) {
baseapi.SugarLogger.Debugf("CheckSkuDiffBetweenJxAndVendor storeID:%d vendorID:%d vendorStoreID:%s vendorListValue:%v", storeID, vendorID, vendorStoreID, vendorListValue) singleStoreHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IPurchasePlatformStoreSkuHandler)
allSkuInfoList := GetMultiStoreAllSkuInfoList(vendorID, vendorListValue.VendorOrgCode)
if partner.IsMultiStore(vendorID) { skuBareInfoList, err := singleStoreHandler.GetStoreSkusBareInfo(ctx, vendorListValue.VendorOrgCode, nil, storeID, vendorStoreID, allSkuInfoList)
singleStoreHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IPurchasePlatformStoreSkuHandler) if err != nil {
allSkuInfoList := GetMultiStoreAllSkuInfoList(vendorID, vendorListValue.VendorOrgCode) baseapi.SugarLogger.Infof("CheckSkuDiffBetweenJxAndVendor GetStoreSkusBareInfo error:%v", err)
skuBareInfoList, err := singleStoreHandler.GetStoreSkusBareInfo(ctx, vendorListValue.VendorOrgCode, nil, storeID, vendorStoreID, allSkuInfoList) } else if len(skuBareInfoList) > 0 {
if err != nil { //获取京东的商品
baseapi.SugarLogger.Infof("CheckSkuDiffBetweenJxAndVendor GetStoreSkusBareInfo error:%v", err) filterSkuInfoMap := GetFilterMultiStoreSkuInfoMap(vendorID, vendorListValue.VendorOrgCode, skuBareInfoList) //map[京东商品ID:SkuNameInfo]
} else if len(skuBareInfoList) > 0 { CompareJxAndVendor(vendorID, storeIDStr, vendorStoreID, storeName, filterJxSkuInfoMapMulti, filterSkuInfoMap, 1)
//获取京东的商品 }
filterSkuInfoMap := GetFilterMultiStoreSkuInfoMap(vendorID, vendorListValue.VendorOrgCode, skuBareInfoList) //map[京东商品ID:SkuNameInfo] } else {
CompareJxAndVendor(vendorID, storeIDStr, vendorStoreID, storeName, filterJxSkuInfoMapMulti, filterSkuInfoMap, 1) singleStoreHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler)
} vendorSkuInfoList, err := singleStoreHandler.GetStoreSkusFullInfo(ctx, nil, storeID, vendorStoreID, nil)
} else { if err != nil {
singleStoreHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler) baseapi.SugarLogger.Infof("CheckSkuDiffBetweenJxAndVendor GetStoreSkusFullInfo error:%v", err)
vendorSkuInfoList, err := singleStoreHandler.GetStoreSkusFullInfo(ctx, nil, storeID, vendorStoreID, nil) } else if len(vendorSkuInfoList) > 0 {
if err != nil { //获取京东的商品
baseapi.SugarLogger.Infof("CheckSkuDiffBetweenJxAndVendor GetStoreSkusFullInfo error:%v", err) filterVendorSkuInfoMap := GetFilterVendorSkuInfoMap(vendorSkuInfoList) //map[平台商品ID:SkuNameInfo]
} else if len(vendorSkuInfoList) > 0 { CompareJxAndVendor(vendorID, storeIDStr, vendorStoreID, storeName, filterJxSkuInfoMapSingle, filterVendorSkuInfoMap, 0)
//获取京东的商品 }
filterVendorSkuInfoMap := GetFilterVendorSkuInfoMap(vendorSkuInfoList) //map[平台商品ID:SkuNameInfo]
CompareJxAndVendor(vendorID, storeIDStr, vendorStoreID, storeName, filterJxSkuInfoMapSingle, filterVendorSkuInfoMap, 0)
} }
} }
} }
@@ -1335,9 +1332,9 @@ func WriteToExcel(task *tasksch.SeqTask, data map[int][]DiffData, depotData map[
} }
} }
func SetJxPrice(jxSkuInfoDataMulti *dao.StoreSkuNamesInfo, storeId int) (err error) { func SetJxPrice(jxSkuInfoDataMulti *dao.StoreSkuNamesInfo, storeId int, Vendorid int) (err error) {
db := dao.GetDB() db := dao.GetDB()
storeDetail, err := dao.GetStoreDetail(dao.GetDB(), storeId, model.VendorIDJX) storeDetail, err := dao.GetStoreDetail(dao.GetDB(), storeId, Vendorid)
if err != nil { if err != nil {
dao.Rollback(db) dao.Rollback(db)
return err return err

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

@@ -1300,7 +1300,7 @@ func SetMTPSStatus(ctx *jxcontext.Context) {
/* 美团配送的门店是否存在，调用美团配送的api（有可能接了），查询京西门店对应的美团配送门店是否存在，若不存在则要在京西这边解绑美团配送门店 /* 美团配送的门店是否存在，调用美团配送的api（有可能接了），查询京西门店对应的美团配送门店是否存在，若不存在则要在京西这边解绑美团配送门店
怎么解绑可以在网页上门店管理那点一下看看调的什么接口，传的什么参数*/ 怎么解绑可以在网页上门店管理那点一下看看调的什么接口，传的什么参数*/
/*获取所有门店信息*/ /*获取所有门店信息*/
test: //test:
for _, StoreCourierList1 := range StoreCourierList { for _, StoreCourierList1 := range StoreCourierList {
diff := false diff := false
StoreLists, _ := dao.GetStoreList(db, []int{StoreCourierList1.StoreID}, nil, nil, nil, "") StoreLists, _ := dao.GetStoreList(db, []int{StoreCourierList1.StoreID}, nil, nil, nil, "")
@@ -1340,7 +1340,7 @@ test:
globals.SugarLogger.Debug(err.Error()) globals.SugarLogger.Debug(err.Error())
return return
} }
break test //break test
} }
} }
globals.SugarLogger.Debug("StoreOpenAll skuID is Complete") globals.SugarLogger.Debug("StoreOpenAll skuID is Complete")