diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 700488c08..d25feca42 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -4591,7 +4591,7 @@ func StoreSkuPriceAudit(ctx *jxcontext.Context, storeSkuAudits []*model.StoreSku if status == model.StoreAuditStatusOnline { return "", fmt.Errorf("审核标志不正确!") } - task := tasksch.NewParallelTask("StoreSkuPriceAudit", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx, + task := tasksch.NewParallelTask("StoreSkuPriceAudit", tasksch.NewParallelConfig().SetParallelCount(5).SetIsContinueWhenError(isContinueWhenError), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { storeAudit := batchItemList[0].(*model.StoreSkuAudit) storeAudits, err := dao.GetStoreSkuAuditLight(db, []int{storeAudit.StoreID}, []int{storeAudit.NameID}, model.StoreAuditStatusOnline) diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 720ce71e6..339602576 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -8,6 +8,8 @@ import ( "strings" "time" + "git.rosy.net.cn/baseapi/platformapi/jdshopapi" + "git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin" "git.rosy.net.cn/jx-callback/business/partner/delivery" "github.com/360EntSecGroup-Skylar/excelize" @@ -1862,15 +1864,44 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { 69948026907} db := dao.GetDB() for _, v := range jdsIds { - var storeSkus *model.StoreSkuBind + vendorSku, _ := api.JdShopAPI.FindSkuById(v) + var sku *model.Sku sql := ` - SELECT * FROM store_sku_bind WHERE store_id = 102919 AND jds_id = ? + SELECT b.* FROM store_sku_bind a,sku b WHERE a.sku_id = b.id AND a.store_id = 102919 AND a.jds_id = ? ` sqlParams := []interface{}{v} - err = dao.GetRow(db, &storeSkus, sql, sqlParams) - if storeSkus != nil { - cms.CurVendorSync.SyncStoresSkus(ctx, nil, 0, db, []int{model.VendorIDJDShop}, []int{model.JdShopMainStoreID}, []int{storeSkus.SkuID}, false, true, true) + err = dao.GetRow(db, &sku, sql, sqlParams) + skus, _ := dao.GetStoreSkus(db, model.VendorIDJDShop, model.JdShopMainStoreID, []int{sku.ID}) + storeSku := skus[0] + if storeSku.Comment != "" { + var specQuality = utils.Float64ToStr(float64(storeSku.SpecQuality)) + storeSku.SpecUnit + flag := false + valuesSku, maxNo, _ := api.JdShopAPI.FindValuesByAttrId(utils.Str2Int(vendorSku.SaleAttrs[0].AttrID)) + for _, vv := range valuesSku { + if vv.Name == specQuality { + flag = true + } + } + if !flag { + err = api.JdShopAPI.UpdateWareSaleAttrvalueAlias(&jdshopapi.UpdateWareSaleAttrvalueAliasParam{ + WareID: vendorSku.WareID, + Props: []*jdshopapi.CreateSkuParamAttrs2{ + &jdshopapi.CreateSkuParamAttrs2{ + AttrID: vendorSku.SaleAttrs[0].AttrID, + AttrValues: []string{vendorSku.SaleAttrs[0].AttrValues[0]}, + AttrValueAlias: []string{sku.Comment}, + }, + }, + }) + } else { + api.JdShopAPI.SaveVenderAttrValue(specQuality, utils.Str2Int(vendorSku.SaleAttrs[0].AttrID), int(storeSku.VendorVendorCatID), maxNo+1) + } } + // attrValue := vendorSku.SaleAttrs[0].AttrValueAlias[0] + // if storeSkus != nil { + // cms.CurVendorSync.SyncStoresSkus(ctx, nil, 0, db, []int{model.VendorIDJDShop}, []int{model.JdShopMainStoreID}, []int{storeSkus.SkuID}, false, true, true) + // } + break } return err } diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index a010b2c14..259365ed6 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -1525,13 +1525,14 @@ func UpdateYbOtherSku(db *DaoDB, storeSkuSyncInfo *StoreSkuSyncInfo) (err error) func UpdateJdsWareID(db *DaoDB, storeSkuSyncInfo *StoreSkuSyncInfo) (err error) { sql := ` UPDATE store_sku_bind - SET jds_ware_id = ? + SET jds_ware_id = ?, jds_id = ? WHERE store_id = ? AND sku_id = ? AND deleted_at = ? ` sqlParams := []interface{}{ storeSkuSyncInfo.JdsWareID, + storeSkuSyncInfo.VendorSkuID, storeSkuSyncInfo.StoreID, storeSkuSyncInfo.SkuID, utils.DefaultTimeValue, diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go index 536e8791b..1af0d1779 100644 --- a/business/partner/purchase/jdshop/store_sku.go +++ b/business/partner/purchase/jdshop/store_sku.go @@ -842,7 +842,7 @@ func buildUpdateSkusParam(storeSku *dao.StoreSkuSyncInfo, v *dao.StoreSkuSyncInf result, err2 := api.JdShopAPI.FindSkuById(utils.Str2Int64(v.VendorSkuID)) err = err2 if specQuality != result.SaleAttrs[0].AttrValueAlias[0] { - api.JdShopAPI.DeleteSku(utils.Str2Int64(v.VendorSkuID)) + err = api.JdShopAPI.DeleteSku(utils.Str2Int64(v.VendorSkuID)) } } if attrIDs["类别"] != 0 {