diff --git a/business/partner/purchase/tao_vegetable/store_sku2.go b/business/partner/purchase/tao_vegetable/store_sku2.go index b76162536..2d16b1c0c 100644 --- a/business/partner/purchase/tao_vegetable/store_sku2.go +++ b/business/partner/purchase/tao_vegetable/store_sku2.go @@ -235,19 +235,17 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI func UpdateTaoVegetable(api *tao_vegetable.API, storeSkuList []*dao.StoreSkuSyncInfo, vendorStoreID string, storeID int, syncType string) (failedList []*partner.StoreSkuInfoWithErr, err error) { param := &request585.AlibabaWdkSkuUpdateRequest{} updateSkuList := make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0) - //totalCount := len(storeSkuList) for _, v := range storeSkuList { price := utils.String2Pointer(utils.Float64ToStr(float64(v.VendorPrice) / float64(100))) updateSku := domain585.AlibabaWdkSkuUpdateSkuDo{ - OuCode: utils.String2Pointer(vendorStoreID), - SkuCode: utils.String2Pointer(utils.Int2Str(v.SkuID)), - SkuName: utils.String2Pointer(checkNameLength(v.SkuName, v.Weight, v.Unit)), - MemberPrice: utils.String2Pointer("0"), - SkuPrice: price, // 优先使用skuPrice 靠后SalePrice - SuggestedPrice: price, // 优先使用skuPrice 靠后SalePrice - CategoryCode: utils.String2Pointer(utils.Int2Str(v.CategoryID)), - MerchantCatCode: utils.String2Pointer(v.VendorCatID), // 优先使用 靠后 category_code - SubTitle: utils.String2Pointer("小时达"), + OuCode: utils.String2Pointer(vendorStoreID), + SkuCode: utils.String2Pointer(utils.Int2Str(v.SkuID)), + SkuName: utils.String2Pointer(checkNameLength(v.SkuName, v.Weight, v.Unit)), + SkuPrice: price, // 优先使用skuPrice 靠后SalePrice + CategoryCode: utils.String2Pointer(utils.Int2Str(v.CategoryID)), + MerchantCatCode: utils.String2Pointer(v.VendorCatID), // 优先使用 靠后 category_code + CleanSkuMemberPrice: utils.Int64ToPointer(model.YES), + SubTitle: utils.String2Pointer("小时达"), } if v.MinOrderCount <= model.YES { updateSku.PurchaseQuantity = utils.Int64ToPointer(model.YES) // 起购单位 @@ -299,9 +297,8 @@ func createTaoVegetable(ctx *jxcontext.Context, api *tao_vegetable.API, storeSku SubTitle: utils.String2Pointer("小时达"), SubTitle1: utils.String2Pointer("一小时速达"), //DeliveryUnit: utils.String2Pointer(storeSku.Unit), - DeliveryUnit: utils.String2Pointer("份"), - DeliverySpec: utils.String2Pointer(utils.Int2Str(model.YES)), - //MemberPrice: price, + DeliveryUnit: utils.String2Pointer("份"), + DeliverySpec: utils.String2Pointer(utils.Int2Str(model.YES)), Storage: utils.String2Pointer(tao_vegetable.CreateStorage), PickFloatRate: utils.String2Pointer(utils.Int2Str(model.NO)), // ? 0 ForbidReceiveDays: utils.Int64ToPointer(tao_vegetable.CreateShelfLife), // ? 7 @@ -483,19 +480,6 @@ func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, v OnlineSaleFlag: utils.Int64ToPointer(tao_vegetable.CreateOfflineSaleFlag), } updateSkuList = append(updateSkuList, updateSku) - - //if (index+model.YES)%tao_vegetable.MAXHandleCount == model.NO || (index+1) == len(storeSkuList) { - // param.ParamList = &updateSkuList - // result, err := api.UpdateStoreSku(param) - // if err != nil { - // globals.SugarLogger.Debugf("UpdateStoreSku Tao Vegetable err : %s", err.Error()) - // } - // // 记录失败的同步数据 - // createFailedList, _ := SelectStoreSkuListByFoodList(storeSkuList, *result, storeID, model.VendorChineseNames[model.VendorIDTaoVegetable], "删除商品(暂无接口,下架处理)") - // failedList = append(failedList, createFailedList...) - // param.ParamList = nil - // updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0) - //} } param.ParamList = &updateSkuList @@ -507,28 +491,6 @@ func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, v createFailedList, _ := SelectStoreSkuListByFoodList(storeSkuList, *result, storeID, model.VendorChineseNames[model.VendorIDTaoVegetable], "删除商品(暂无接口,下架处理)") failedList = append(failedList, createFailedList...) return failedList, err - //param := &request.AlibabaAxChannelSkuStatusUpdateRequest{ChannelSkuUpdateStatusReq: &domain.AlibabaAxChannelSkuStatusUpdateChannelSkuUpdateStatusReq{ - // StoreId: utils.String2Pointer(vendorStoreID), - // ChannelCode: utils.String2Pointer(tao_vegetable.TaoVegetableChannelCode), - // OnlineSaleFlag: utils.Int64ToPointer(tao_vegetable.CreateIsOnline), - //}} - //var updateOffShelf = make([]tao_vegetable.VegetableResultList, 0, len(storeSkuList)) - //for _, v := range storeSkuList { - // param.ChannelSkuUpdateStatusReq.SkuCode = utils.String2Pointer(utils.Int2Str(v.SkuID)) - // // StoreSkuUpdateOffShelf 这个接口暂时有问题使用更新接口上下架 - // if err = getAPI(getStoreVendorOrgCode(storeID), storeID, vendorStoreID).StoreSkuUpdateOffShelf(param); err != nil { - // updateOffShelf = append(updateOffShelf, tao_vegetable.VegetableResultList{ - // ProductID: v.VendorSkuID, - // SkuID: utils.Int2Str(v.SkuID), - // ErrMsg: err.Error(), - // }) - // } - //} - //failedList, _ = SelectStoreSkuListByFoodList(storeSkuList, updateOffShelf, storeID, model.VendorChineseNames[model.VendorIDTaoVegetable], "批量删除商品(暂时下架,无删除接口)") - //if len(failedList) > 0 { - // err = nil - //} - //return failedList, err } // UpdateStoreSkusStatus 批量更新商品上下架状态 @@ -543,21 +505,9 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr SkuCode: utils.String2Pointer(utils.Int2Str(v.SkuID)), OnlineSaleFlag: utils.Int64ToPointer(onlineStatus), SubTitle: utils.String2Pointer("小时达"), + //CleanSkuMemberPrice: utils.Int64ToPointer(model.YES), } updateSkuList = append(updateSkuList, updateSku) - - //if (index+model.YES)%tao_vegetable.MAXHandleCount == model.NO || (index+1) == len(storeSkuList) { - // param.ParamList = &updateSkuList - // result, err := api.UpdateStoreSku(param) - // if err != nil { - // globals.SugarLogger.Debugf("UpdateStoreSku Tao Vegetable err : %s", err.Error()) - // } - // // 记录失败的同步数据 - // createFailedList, _ := SelectStoreSkuListByFoodList(storeSkuList, *result, storeID, model.VendorChineseNames[model.VendorIDTaoVegetable], "批量更新商品上下架") - // failedList = append(failedList, createFailedList...) - // param.ParamList = nil - // updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0) - //} } param.ParamList = &updateSkuList @@ -582,8 +532,6 @@ func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, vendorOrg SkuCode: utils.String2Pointer(utils.Int2Str(v.SkuID)), SkuPrice: price, CleanSkuMemberPrice: utils.Int64ToPointer(model.YES), - SuggestedPrice: price, - MemberPrice: utils.String2Pointer("0"), SubTitle: utils.String2Pointer("小时达"), } updateSkuList = append(updateSkuList, updateSku) @@ -878,9 +826,8 @@ func (p *PurchaseHandler) UpdateStoreSkusSpecTag(ctx *jxcontext.Context, vendorO api := getAPI(getStoreVendorOrgCode(storeID), storeID, vendorStoreID) for _, v := range storeSkuList { updateSku := domain585.AlibabaWdkSkuUpdateSkuDo{ - OuCode: utils.String2Pointer(vendorStoreID), - SkuCode: utils.String2Pointer(utils.Int2Str(v.SkuID)), - SubTitle: utils.String2Pointer("小时达"), + OuCode: utils.String2Pointer(vendorStoreID), + SkuCode: utils.String2Pointer(utils.Int2Str(v.SkuID)), } if v.IsSpecialty <= model.YES { updateSku.PurchaseQuantity = utils.Int64ToPointer(model.YES) @@ -889,21 +836,6 @@ func (p *PurchaseHandler) UpdateStoreSkusSpecTag(ctx *jxcontext.Context, vendorO } updateSkuList = append(updateSkuList, updateSku) - //if (index+model.YES)%tao_vegetable.MAXHandleCount == model.NO || (index+1) == len(storeSkuList) { - // param.ParamList = &updateSkuList - // result, err := api.UpdateStoreSku(param) - // if err != nil { - // globals.SugarLogger.Debugf("UpdateStoreSku Tao Vegetable err : %s", err.Error()) - // } - // // 记录失败的同步数据 - // for _, v := range *result { - // if v.ErrMsg != "" { - // errList = append(errList, v.ErrMsg) - // } - // } - // param.ParamList = nil - // updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0) - //} } param.ParamList = &updateSkuList result, err := api.UpdateStoreSku(param)