diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 4d7248c0c..d021103c2 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -537,7 +537,7 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus, i t2.comment, t2.category_id sku_category_id, t2.status sku_status, t2.eclp_id, t4.created_at bind_created_at, t4.updated_at bind_updated_at, t4.last_operator bind_last_operator, t4.deleted_at bind_deleted_at, t4.sub_store_id, t4.price bind_price, IF(t4.unit_price IS NOT NULL, t4.unit_price, t1.price) unit_price, t4.status store_sku_status, t4.auto_sale_at, - t4.ebai_id, t4.mtwm_id, t4.yb_id, CONCAT(smm.yb_store_prefix,t1.yb_name_suffix) yb_sku_name, + t4.ebai_id, t4.mtwm_id, t4.yb_id, CONCAT(smm.yb_store_prefix,t1.yb_name_suffix) yb_sku_name, t4.jds_id, t4.jds_ware_id, t4.jd_sync_status, t4.ebai_sync_status, t4.mtwm_sync_status, t4.yb_sync_status, t4.jds_sync_status, t4.jd_price, t4.ebai_price, t4.mtwm_price, t4.jx_price, t4.yb_price, t4.jds_price, t4.jd_lock_time, t4.ebai_lock_time, t4.mtwm_lock_time, t4.jx_lock_time, t4.yb_lock_time, t4.jds_lock_time, @@ -549,6 +549,8 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus, i } var tmpList []*tGetStoresSkusInfo beginTime := time.Now() + fmt.Println("test1", sql) + fmt.Println(sqlParams) if err = dao.GetRows(db, &tmpList, sql, sqlParams...); err != nil { dao.Rollback(db) return nil, err diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go index f28e3e461..a6469949a 100644 --- a/business/partner/purchase/jdshop/store_sku.go +++ b/business/partner/purchase/jdshop/store_sku.go @@ -65,10 +65,21 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) { if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID { for _, v := range storeSkuList { + // skuName := &model.SkuName{} + // skuName.ID = v.NameID + // db := dao.GetDB() + // if err = dao.GetEntity(db, skuName); err != nil { + // return failedList, err + // } + // payload := map[string]interface{}{ + // "name": v.Name, + // } + // valid := dao.StrictMakeMapByStructObject(payload, skuName, ctx.GetUserName()) + name := filterSensitiveWord(v.Name) updateWareParam := &jdshopapi.UpdateWareParam{ WareID: v.JdsWareID, - Title: v.SkuName, - Weight: v.Weight, + Title: name, + // Weight: v.Weight, } err = api.JdShopAPI.UpdateWare(updateWareParam) } @@ -362,6 +373,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j var ( attrIDs = make(map[string]int) //贮存方式,净含量,保质期IDs zctjValueID int64 //贮存条件冷藏0-4的id + gcjkValueID int64 //国产,进口的id attrsProp []*jdshopapi.CreateSkuParamAttrs ) attrs, err := api.JdShopAPI.FindAttrs(int(storeSku.VendorVendorCatID)) @@ -374,6 +386,8 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j attrIDs[v.Name] = v.ID } else if v.Name == "规格" { attrIDs[v.Name] = v.ID + } else if v.Name == "国产/进口" { + attrIDs[v.Name] = v.ID } } values, _, err := api.JdShopAPI.FindValuesByAttrId(attrIDs["贮存条件"]) @@ -382,6 +396,21 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j zctjValueID = v.ID } } + if attrIDs["国产/进口"] != 0 { + values2, _, err2 := api.JdShopAPI.FindValuesByAttrId(attrIDs["国产/进口"]) + err = err2 + for _, v := range values2 { + if v.Name == "国产" { + gcjkValueID = v.ID + } + } + attrgcjk := &jdshopapi.CreateSkuParamAttrs{ + AttrID: utils.Int2Str(attrIDs["国产/进口"]), + AttrValues: []string{utils.Int64ToStr(gcjkValueID)}, + } + attrsProp = append(attrsProp, attrgcjk) + } + attrZctj := &jdshopapi.CreateSkuParamAttrs{ AttrID: utils.Int2Str(attrIDs["贮存条件"]), AttrValues: []string{utils.Int64ToStr(zctjValueID)},