diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index d0fd8d14f..1ba90cd03 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -3586,8 +3586,6 @@ func GetSkuNamesNew(ctx *jxcontext.Context, keyword string, skuIDs, skuNameIDs [ panic(r) } }() - globals.SugarLogger.Debugf("------sql := %s", sql) - globals.SugarLogger.Debugf("------sqlParams := %s", utils.Format4Output(sqlParams, false)) if err = dao.GetRowsTx(txDB, &skuNamesInfo.SkuNames, sql, sqlParams...); err == nil { skuNamesInfo.TotalCount = dao.GetLastTotalRowCount2(db, txDB) dao.Commit(db, txDB) @@ -3620,7 +3618,6 @@ func GetSkuNamesNew(ctx *jxcontext.Context, keyword string, skuIDs, skuNameIDs [ ` sqlParams := []interface{}{v.ID, model.ThingTypeSku, "320406", "379599", "390558", utils.DefaultTimeValue} // 京东到家菜市,果切,宠物 dao.GetRows(db, &things, sql, sqlParams) - globals.SugarLogger.Debugf("------things := %s", utils.Format4Output(things, false)) skusVendor := &model.SkuWithVendor{ Sku: v, MapList: things, diff --git a/business/model/dao/sku.go b/business/model/dao/sku.go index 8d37f73cb..d46ea9550 100644 --- a/business/model/dao/sku.go +++ b/business/model/dao/sku.go @@ -218,6 +218,27 @@ func GetSkuNames(db *DaoDB, nameIDs []int, upcs []string, name string, isExd boo return nil, err } +func GetSkuNamesByAttr(db *DaoDB, mtAttr string) (skuNameList []*model.SkuName, err error) { + sql := ` + SELECT t1.* + FROM sku_name t1 + WHERE t1.deleted_at = ? + ` + sqlParams := []interface{}{ + utils.DefaultTimeValue, + } + + if mtAttr != "" { + sql += " AND t1.mt_attribute LIKE ?" + sqlParams = append(sqlParams, "%"+mtAttr+"%") + } + + if err = GetRows(db, &skuNameList, sql, sqlParams...); err == nil { + return skuNameList, nil + } + return nil, err +} + func GetSkuIDByNames(db *DaoDB, nameIDs []int) (skuIDs []int, err error) { skuList, err := GetSkus(db, nil, nameIDs, nil, nil, nil) if err == nil { diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go index 3b2cc00a9..53b76e591 100644 --- a/business/partner/purchase/mtwm/store_sku2.go +++ b/business/partner/purchase/mtwm/store_sku2.go @@ -565,6 +565,11 @@ func SwitchAttr(apiObj *mtwmapi.API, vendorStoreID string, vendorCatID int64, na Value: "其他", }} } + } else if v.AttrID == mtwmapi.SpecialAttrOrigin { // 产地默认国产 + attrValue.ValueList = []ValueList{{ + ValueID: 1300000003, + Value: "国产", + }} } else { if len(v.ValueList) > 0 { attrValue.ValueList = []ValueList{{ diff --git a/controllers/bidding.go b/controllers/bidding.go index de0a28b21..0d3d19e9e 100644 --- a/controllers/bidding.go +++ b/controllers/bidding.go @@ -300,3 +300,52 @@ func (c *BiddingController) UpdateStockBySkuID() { return }) } + +// RefreshSkuNameMTAttr 更新商品库美团属性进口为国产 +// @Title 更新商品库美团属性进口为国产 +// @Description 批量更新库存 +// @Param token header string true "认证token" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /RefreshSkuNameMTAttr [get] +func (c *BiddingController) RefreshSkuNameMTAttre() { + c.callGetRefundOrderList(func(params *tBindGetRefundOrderListParams) (retVal interface{}, hint string, err error) { + db := dao.GetDB() + nameList, err := dao.GetSkuNamesByAttr(db, "1300000004") + if err != nil { + return retVal, hint, err + } + for _, v := range nameList { + attr := make([]*AttrList, 0, 0) + if err = json.Unmarshal([]byte(v.MtAttribute), attr); err != nil { + return retVal, hint, err + } + + for _, v2 := range attr { + if v2.AttrId == 1200000132 { + for _, v3 := range v2.ValueList { + if v3.ValueId == 1300000004 { + v3.ValueId = 1300000003 + v3.Value = "国产" + + byteV2, _ := json.Marshal(v2) + dao.UpdateSkuNameMtAttr(db, int64(v.ID), string(byteV2)) + break + } + } + break + } + } + } + return retVal, hint, err + }) +} + +type AttrList struct { + AttrId int `json:"attr_id"` + AttrName string `json:"attr_name"` + ValueList []struct { + ValueId int `json:"value_id"` + Value string `json:"value"` + } `json:"valueList"` +} diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go index 723a0459f..a814035f7 100644 --- a/controllers/cms_store_sku.go +++ b/controllers/cms_store_sku.go @@ -1,13 +1,10 @@ package controllers import ( + "errors" "git.rosy.net.cn/baseapi/platformapi/jdapi" - "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/auth2" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/globals" - - "errors" "git.rosy.net.cn/jx-callback/business/jxstore/cms" "git.rosy.net.cn/jx-callback/business/jxutils" @@ -1032,7 +1029,6 @@ func (c *StoreSkuController) GetVendorStoreSkus() { // @router /GetStoresSkusForStore [get] func (c *StoreSkuController) GetStoresSkusForStore() { c.callGetStoresSkusForStore(func(params *tStoreSkuGetStoresSkusForStoreParams) (retVal interface{}, errCode string, err error) { - globals.SugarLogger.Debugf("daata :======%s", utils.Format4Output(params.MapData, false)) retVal, err = cms.GetStoresSkusForStore(params.Ctx, params.StoreID, params.IsFocus, params.IsAct, params.Keyword, params.CategoryID, params.Status, params.Offset, params.PageSize, params.Stock, params.LocationCode, params.LocationCode2) return retVal, "", err }) diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 52628f1e0..cc3357e9a 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -4506,6 +4506,16 @@ func init() { Filters: nil, Params: nil}) + // 更新美团属性进口为国产 + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:BiddingController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:BiddingController"], + web.ControllerComments{ + Method: "RefreshSkuNameMTAttr", + Router: `/RefreshSkuNameMTAttr`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + // 版本设置 web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:VersionController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:VersionController"], web.ControllerComments{