修改对比方法和美团配送状态方法的调用
This commit is contained in:
@@ -2,6 +2,8 @@ package cms
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
|
||||||
|
"git.rosy.net.cn/jx-callback/globals/api"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
@@ -361,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)
|
||||||
@@ -565,92 +561,92 @@ func CompareJxAndMultiVenderDepot(ctx *jxcontext.Context, vendorMap map[int]bool
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//func StoreOpenAll(ctx *jxcontext.Context) {
|
func StoreOpenAll(ctx *jxcontext.Context) {
|
||||||
//globals.SugarLogger.Debug("StoreOpenAll skuID is start")
|
globals.SugarLogger.Debug("StoreOpenAll skuID is start")
|
||||||
///*获取美团门店信息*/
|
/*获取美团门店信息*/
|
||||||
//StoreInfoList, _ := api.MtpsAPI.GetStoreStatusAll()
|
StoreInfoList, _ := api.MtpsAPI.GetStoreStatusAll()
|
||||||
//StoreInfoList2 := make(map[string]string)
|
StoreInfoList2 := make(map[string]string)
|
||||||
//for _, store := range StoreInfoList {
|
for _, store := range StoreInfoList {
|
||||||
// for _, data := range store.DataList {
|
for _, data := range store.DataList {
|
||||||
// StoreInfoList2[data.OuterPoiID] = data.PoiName
|
StoreInfoList2[data.OuterPoiID] = data.PoiName
|
||||||
// }
|
}
|
||||||
//}
|
}
|
||||||
//db := dao.GetDB()
|
db := dao.GetDB()
|
||||||
///*比较营业状态*/
|
/*比较营业状态*/
|
||||||
///*把获取的京西状态和名称存一下*/
|
/*把获取的京西状态和名称存一下*/
|
||||||
//StoreCourierList, _ := dao.GetStoreCourierList(db, []int{}, model.StoreStatusAll, model.StoreStatusAll)
|
StoreCourierList, _ := dao.GetStoreCourierList(db, []int{}, model.StoreStatusAll, model.StoreStatusAll)
|
||||||
///*循环美团*/
|
/*循环美团*/
|
||||||
//for _, StoreInfoList1 := range StoreInfoList {
|
for _, StoreInfoList1 := range StoreInfoList {
|
||||||
// for _, StoreInfoList11 := range StoreInfoList1.DataList {
|
for _, StoreInfoList11 := range StoreInfoList1.DataList {
|
||||||
// /*循环京西*/
|
/*循环京西*/
|
||||||
// for _, StoreCourierList1 := range StoreCourierList {
|
for _, StoreCourierList1 := range StoreCourierList {
|
||||||
// /*只比较美团*/
|
/*只比较美团*/
|
||||||
// if StoreCourierList1.VendorID != model.VendorIDMTPS {
|
if StoreCourierList1.VendorID != model.VendorIDMTPS {
|
||||||
// continue
|
continue
|
||||||
// }
|
}
|
||||||
// /*如果门店ID相同的时候进入判断,一个门店只用判断一次就行*/
|
/*如果门店ID相同的时候进入判断,一个门店只用判断一次就行*/
|
||||||
// if StoreCourierList1.VendorStoreID == StoreInfoList11.OuterPoiID {
|
if StoreCourierList1.VendorStoreID == StoreInfoList11.OuterPoiID {
|
||||||
// if StoreCourierList1.Status != StoreInfoList11.OpenType {
|
if StoreCourierList1.Status != StoreInfoList11.OpenType {
|
||||||
// sl := make(map[string]interface{})
|
sl := make(map[string]interface{})
|
||||||
// sl["vendorStoreID"] = StoreInfoList11.OuterPoiID
|
sl["vendorStoreID"] = StoreInfoList11.OuterPoiID
|
||||||
// sl["status"] = StoreInfoList11.OpenType
|
sl["status"] = StoreInfoList11.OpenType
|
||||||
// globals.SugarLogger.Debugf("被修改配送状态的VendorStoreID是:%s,名称是:%s,美团状态是:%s,本地状态是:%s",
|
globals.SugarLogger.Debugf("被修改配送状态的VendorStoreID是:%s,名称是:%s,美团状态是:%s,本地状态是:%s",
|
||||||
// StoreInfoList11.OuterPoiID, StoreInfoList11.PoiName, strconv.Itoa(StoreInfoList11.OpenType), strconv.Itoa(StoreCourierList1.Status))
|
StoreInfoList11.OuterPoiID, StoreInfoList11.PoiName, strconv.Itoa(StoreInfoList11.OpenType), strconv.Itoa(StoreCourierList1.Status))
|
||||||
// UpdateStoreCourierMap(ctx, nil, StoreCourierList1.StoreID, StoreCourierList1.VendorID, sl, ctx.GetUserName())
|
UpdateStoreCourierMap(ctx, nil, StoreCourierList1.StoreID, StoreCourierList1.VendorID, sl, ctx.GetUserName())
|
||||||
// break
|
break
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
//}
|
}
|
||||||
///* 美团配送的门店是否存在,调用美团配送的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, "")
|
||||||
// if StoreLists == nil {
|
if StoreLists == nil {
|
||||||
// globals.SugarLogger.Debugf("StoreID为:%s,在store表未找到", StoreCourierList1.StoreID)
|
globals.SugarLogger.Debugf("StoreID为:%s,在store表未找到", StoreCourierList1.StoreID)
|
||||||
// continue
|
continue
|
||||||
// }
|
}
|
||||||
// if StoreCourierList1.VendorID != model.VendorIDMTPS || StoreCourierList1.VendorStoreID == "" {
|
if StoreCourierList1.VendorID != model.VendorIDMTPS || StoreCourierList1.VendorStoreID == "" {
|
||||||
// continue
|
continue
|
||||||
// }
|
}
|
||||||
// if StoreCourierList1.Status == model.StoreStatusDisabled || StoreCourierList1.Status == model.StoreStatusClosed {
|
if StoreCourierList1.Status == model.StoreStatusDisabled || StoreCourierList1.Status == model.StoreStatusClosed {
|
||||||
// continue
|
continue
|
||||||
// }
|
}
|
||||||
// /*京西不为空,容错*/
|
/*京西不为空,容错*/
|
||||||
// //if {
|
//if {
|
||||||
// /*调用API获取美团的商店信息*/
|
/*调用API获取美团的商店信息*/
|
||||||
// MTPSInfo := new(mtpsapi.ShopInfo)
|
MTPSInfo := new(mtpsapi.ShopInfo)
|
||||||
// MTPSInfo, _ = api.MtpsAPI.ShopQuery(StoreCourierList1.VendorStoreID)
|
MTPSInfo, _ = api.MtpsAPI.ShopQuery(StoreCourierList1.VendorStoreID)
|
||||||
// if MTPSInfo == nil {
|
if MTPSInfo == nil {
|
||||||
// globals.SugarLogger.Debug("美团未找到该门店," + StoreLists[0].Name + strconv.Itoa(StoreCourierList1.StoreID) + " 被解绑,关联的ID为:" + StoreCourierList1.VendorStoreID)
|
globals.SugarLogger.Debug("美团未找到该门店," + StoreLists[0].Name + strconv.Itoa(StoreCourierList1.StoreID) + " 被解绑,关联的ID为:" + StoreCourierList1.VendorStoreID)
|
||||||
// diff = true
|
diff = true
|
||||||
// }
|
}
|
||||||
// if MTPSInfo != nil && MTPSInfo.ShopName == "" {
|
if MTPSInfo != nil && MTPSInfo.ShopName == "" {
|
||||||
// MTPSInfo.ShopName = StoreInfoList2[MTPSInfo.ShopID]
|
MTPSInfo.ShopName = StoreInfoList2[MTPSInfo.ShopID]
|
||||||
// }
|
}
|
||||||
// if MTPSInfo != nil && MTPSInfo.ShopLng != StoreCourierList1.Lng && MTPSInfo.ShopLat == StoreCourierList1.Lat {
|
if MTPSInfo != nil && MTPSInfo.ShopLng != StoreCourierList1.Lng && MTPSInfo.ShopLat == StoreCourierList1.Lat {
|
||||||
// /*平台上但是坐标不同,解绑*/
|
/*平台上但是坐标不同,解绑*/
|
||||||
// globals.SugarLogger.Debug("商店与美团配送上的坐标不同," + StoreLists[0].Name + strconv.Itoa(StoreCourierList1.StoreID) + " 被解绑,关联的ID为:" + StoreCourierList1.VendorStoreID)
|
globals.SugarLogger.Debug("商店与美团配送上的坐标不同," + StoreLists[0].Name + strconv.Itoa(StoreCourierList1.StoreID) + " 被解绑,关联的ID为:" + StoreCourierList1.VendorStoreID)
|
||||||
// if _, err := DeleteStoreCourierMap(ctx, db, StoreCourierList1.StoreID, StoreCourierList1.VendorID, ctx.GetUserName()); err != nil {
|
if _, err := DeleteStoreCourierMap(ctx, db, StoreCourierList1.StoreID, StoreCourierList1.VendorID, ctx.GetUserName()); err != nil {
|
||||||
// globals.SugarLogger.Debug(err.Error())
|
globals.SugarLogger.Debug(err.Error())
|
||||||
// return
|
return
|
||||||
// }
|
}
|
||||||
// diff = true
|
diff = true
|
||||||
// }
|
}
|
||||||
// if diff {
|
if diff {
|
||||||
// if _, err := DeleteStoreCourierMap(ctx, db, StoreCourierList1.StoreID, StoreCourierList1.VendorID, ctx.GetUserName()); err != nil {
|
if _, err := DeleteStoreCourierMap(ctx, db, StoreCourierList1.StoreID, StoreCourierList1.VendorID, ctx.GetUserName()); err != nil {
|
||||||
// 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")
|
||||||
//}
|
}
|
||||||
|
|
||||||
//func StoreOpenAll(ctx *jxcontext.Context) {
|
//func StoreOpenAll(ctx *jxcontext.Context) {
|
||||||
//db := dao.GetDB()
|
//db := dao.GetDB()
|
||||||
@@ -805,62 +801,62 @@ func CompareJxAndMultiVenderDepot(ctx *jxcontext.Context, vendorMap map[int]bool
|
|||||||
//}
|
//}
|
||||||
//}
|
//}
|
||||||
|
|
||||||
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 {
|
||||||
globals.SugarLogger.Debugf("商店列表获取失败")
|
// globals.SugarLogger.Debugf("商店列表获取失败")
|
||||||
}
|
// }
|
||||||
var StoreMapLists []*model.StoreMap
|
// var StoreMapLists []*model.StoreMap
|
||||||
for _, StoreList := range StoreLists {
|
// for _, StoreList := range StoreLists {
|
||||||
if StoreMapLists, err = dao.GetStoresMapList(db, []int{0, 1, 3}, []int{StoreList.ID}, nil, 1, -1, "", ""); err != nil {
|
// if StoreMapLists, err = dao.GetStoresMapList(db, []int{0, 1, 3}, []int{StoreList.ID}, nil, 1, -1, "", ""); err != nil {
|
||||||
globals.SugarLogger.Debugf("商店列表获取失败")
|
// globals.SugarLogger.Debugf("商店列表获取失败")
|
||||||
}
|
// }
|
||||||
if len(StoreMapLists) > 0 {
|
// if len(StoreMapLists) > 0 {
|
||||||
/*将map查询的结果全部放进数组*/
|
// /*将map查询的结果全部放进数组*/
|
||||||
for _, StoreMapList := range StoreMapLists {
|
// for _, StoreMapList := range StoreMapLists {
|
||||||
/*二元运算符*/
|
// /*二元运算符*/
|
||||||
StoreMapList.SyncStatus = StoreMapList.SyncStatus | model.SyncFlagModifiedMask
|
// StoreMapList.SyncStatus = StoreMapList.SyncStatus | model.SyncFlagModifiedMask
|
||||||
StoreMapList.UpdatedAt = time.Now()
|
// StoreMapList.UpdatedAt = time.Now()
|
||||||
StoreMapList.LastOperator = ctx.GetUserName()
|
// StoreMapList.LastOperator = ctx.GetUserName()
|
||||||
dao.UpdateEntity(db, StoreMapList, "SyncStatus", "UpdatedAt", "LastOperator")
|
// dao.UpdateEntity(db, StoreMapList, "SyncStatus", "UpdatedAt", "LastOperator")
|
||||||
//}
|
// //}
|
||||||
/*同步*/
|
// /*同步*/
|
||||||
if _, err = CurVendorSync.SyncStore(ctx, db, StoreMapList.VendorID, StoreList.ID, false, ctx.GetUserName()); err != nil {
|
// if _, err = CurVendorSync.SyncStore(ctx, db, StoreMapList.VendorID, StoreList.ID, false, ctx.GetUserName()); err != nil {
|
||||||
globals.SugarLogger.Debugf("同步失败")
|
// globals.SugarLogger.Debugf("同步失败")
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
if StoreMapLists, err = dao.GetStoresMapList(db, []int{9}, []int{StoreList.ID}, nil, 1, -1, "", ""); err != nil {
|
// if StoreMapLists, err = dao.GetStoresMapList(db, []int{9}, []int{StoreList.ID}, nil, 1, -1, "", ""); err != nil {
|
||||||
globals.SugarLogger.Debugf("商店列表获取失败")
|
// globals.SugarLogger.Debugf("商店列表获取失败")
|
||||||
}
|
// }
|
||||||
if len(StoreMapLists) == 0 {
|
// if len(StoreMapLists) == 0 {
|
||||||
/*遍历,绑定*/
|
// /*遍历,绑定*/
|
||||||
Map := &model.StoreMap{}
|
// Map := &model.StoreMap{}
|
||||||
Map.VendorStoreID = strconv.Itoa(StoreList.ID)
|
// Map.VendorStoreID = strconv.Itoa(StoreList.ID)
|
||||||
Map.AutoPickup = 1
|
// Map.AutoPickup = 1
|
||||||
Map.DeliveryCompetition = 1
|
// Map.DeliveryCompetition = 1
|
||||||
Map.PricePercentage = 100
|
// Map.PricePercentage = 100
|
||||||
Map.IsSync = 1
|
// Map.IsSync = 1
|
||||||
Map.PricePercentagePack = "京西100-100"
|
// Map.PricePercentagePack = "京西100-100"
|
||||||
Map.DeliveryFeeDeductionSill = 0
|
// Map.DeliveryFeeDeductionSill = 0
|
||||||
Map.DeliveryFeeDeductionFee = 0
|
// Map.DeliveryFeeDeductionFee = 0
|
||||||
Map.IsOrder = 0
|
// Map.IsOrder = 0
|
||||||
if _, err := AddStoreVendorMap(ctx, db, 9, "", StoreList.ID, Map); err != nil {
|
// if _, err := AddStoreVendorMap(ctx, db, 9, "", StoreList.ID, Map); err != nil {
|
||||||
globals.SugarLogger.Debugf("AddStoreVendorMap调用出错,StoreID是" + strconv.Itoa(StoreList.ID))
|
// globals.SugarLogger.Debugf("AddStoreVendorMap调用出错,StoreID是" + strconv.Itoa(StoreList.ID))
|
||||||
globals.SugarLogger.Debugf(err.Error())
|
// globals.SugarLogger.Debugf(err.Error())
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
/*改配送范围*/
|
// /*改配送范围*/
|
||||||
//deliverrangetype 3
|
// //deliverrangetype 3
|
||||||
//deliverrange 3000
|
// //deliverrange 3000
|
||||||
StoreList.DeliveryRange = "3000"
|
// StoreList.DeliveryRange = "3000"
|
||||||
StoreList.DeliveryRangeType = 3
|
// StoreList.DeliveryRangeType = 3
|
||||||
StoreList.UpdatedAt = time.Now()
|
// StoreList.UpdatedAt = time.Now()
|
||||||
StoreList.LastOperator = ctx.GetUserName()
|
// StoreList.LastOperator = ctx.GetUserName()
|
||||||
dao.UpdateEntity(db, StoreList, "DeliveryRange", "DeliveryRangeType", "LastOperator", "UpdatedAt")
|
// dao.UpdateEntity(db, StoreList, "DeliveryRange", "DeliveryRangeType", "LastOperator", "UpdatedAt")
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
|
|
||||||
func TestDiff(ctx *jxcontext.Context, vendorIDList []int, storeIDList []int) {
|
func TestDiff(ctx *jxcontext.Context, vendorIDList []int, storeIDList []int) {
|
||||||
baseapi.SugarLogger.Debugf("CheckSkuDiffBetweenJxAndVendor start time: %v", time.Now())
|
baseapi.SugarLogger.Debugf("CheckSkuDiffBetweenJxAndVendor start time: %v", time.Now())
|
||||||
@@ -949,59 +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, vendorID)
|
/*重新计算价格*/
|
||||||
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)
|
|
||||||
/*重新计算价格*/
|
|
||||||
SetJxPrice(jxSkuInfoDataSingle, storeID, vendorID)
|
|
||||||
filterJxSkuInfoMapSingle = GetFilterJxSkuInfoMap(jxSkuInfoDataSingle.SkuNames) //map[京西商品ID:StoreSkuNameExt]
|
|
||||||
singleFlag = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
vendorStoreID := vendorListValue.VendorStoreID
|
|
||||||
baseapi.SugarLogger.Debugf("CheckSkuDiffBetweenJxAndVendor storeID:%d vendorID:%d vendorStoreID:%s vendorListValue:%v", storeID, vendorID, vendorStoreID, vendorListValue)
|
|
||||||
|
|
||||||
if partner.IsMultiStore(vendorID) {
|
if partner.IsMultiStore(vendorID) {
|
||||||
singleStoreHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IPurchasePlatformStoreSkuHandler)
|
singleStoreHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IPurchasePlatformStoreSkuHandler)
|
||||||
allSkuInfoList := GetMultiStoreAllSkuInfoList(vendorID, vendorListValue.VendorOrgCode)
|
allSkuInfoList := GetMultiStoreAllSkuInfoList(vendorID, vendorListValue.VendorOrgCode)
|
||||||
skuBareInfoList, err := singleStoreHandler.GetStoreSkusBareInfo(ctx, vendorListValue.VendorOrgCode, nil, storeID, vendorStoreID, allSkuInfoList)
|
skuBareInfoList, err := singleStoreHandler.GetStoreSkusBareInfo(ctx, vendorListValue.VendorOrgCode, nil, storeID, vendorStoreID, allSkuInfoList)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
baseapi.SugarLogger.Infof("CheckSkuDiffBetweenJxAndVendor GetStoreSkusBareInfo error:%v", err)
|
baseapi.SugarLogger.Infof("CheckSkuDiffBetweenJxAndVendor GetStoreSkusBareInfo error:%v", err)
|
||||||
} else if len(skuBareInfoList) > 0 {
|
} else if len(skuBareInfoList) > 0 {
|
||||||
//获取京东的商品
|
//获取京东的商品
|
||||||
filterSkuInfoMap := GetFilterMultiStoreSkuInfoMap(vendorID, vendorListValue.VendorOrgCode, skuBareInfoList) //map[京东商品ID:SkuNameInfo]
|
filterSkuInfoMap := GetFilterMultiStoreSkuInfoMap(vendorID, vendorListValue.VendorOrgCode, skuBareInfoList) //map[京东商品ID:SkuNameInfo]
|
||||||
CompareJxAndVendor(vendorID, storeIDStr, vendorStoreID, storeName, filterJxSkuInfoMapMulti, filterSkuInfoMap, 1)
|
CompareJxAndVendor(vendorID, storeIDStr, vendorStoreID, storeName, filterJxSkuInfoMapMulti, filterSkuInfoMap, 1)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
singleStoreHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler)
|
singleStoreHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler)
|
||||||
vendorSkuInfoList, err := singleStoreHandler.GetStoreSkusFullInfo(ctx, nil, storeID, vendorStoreID, nil)
|
vendorSkuInfoList, err := singleStoreHandler.GetStoreSkusFullInfo(ctx, nil, storeID, vendorStoreID, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
baseapi.SugarLogger.Infof("CheckSkuDiffBetweenJxAndVendor GetStoreSkusFullInfo error:%v", err)
|
baseapi.SugarLogger.Infof("CheckSkuDiffBetweenJxAndVendor GetStoreSkusFullInfo error:%v", err)
|
||||||
} else if len(vendorSkuInfoList) > 0 {
|
} else if len(vendorSkuInfoList) > 0 {
|
||||||
//获取京东的商品
|
//获取京东的商品
|
||||||
filterVendorSkuInfoMap := GetFilterVendorSkuInfoMap(vendorSkuInfoList) //map[平台商品ID:SkuNameInfo]
|
filterVendorSkuInfoMap := GetFilterVendorSkuInfoMap(vendorSkuInfoList) //map[平台商品ID:SkuNameInfo]
|
||||||
CompareJxAndVendor(vendorID, storeIDStr, vendorStoreID, storeName, filterJxSkuInfoMapSingle, filterVendorSkuInfoMap, 0)
|
CompareJxAndVendor(vendorID, storeIDStr, vendorStoreID, storeName, filterJxSkuInfoMapSingle, filterVendorSkuInfoMap, 0)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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")
|
||||||
|
|||||||
Reference in New Issue
Block a user