From 7843e96486ecd30bb3edaa0608ee95eff2ffee36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 20 Oct 2022 15:49:35 +0800 Subject: [PATCH] 1 --- business/jxstore/cms/sku.go | 3 --- business/model/sku.go | 14 +++++++------- globals/refutil/refutil.go | 6 ++++++ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 40957fb29..78bd3fca3 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1017,9 +1017,6 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf } } - if payload["tiktokAttribute"] != nil { - skuName.TiktokAttribute = payload["tiktokAttribute"].(string) - } txDB, _ := dao.Begin(db) defer func() { if r := recover(); r != nil { diff --git a/business/model/sku.go b/business/model/sku.go index 4a9e66f30..fa136f09c 100644 --- a/business/model/sku.go +++ b/business/model/sku.go @@ -199,13 +199,13 @@ type SkuName struct { // JdSyncStatus int8 `orm:"default(2)" json:"jdSyncStatus"` // LinkID int `orm:"column(link_id);null;index" json:"linkID"` - YbNameSuffix string `json:"ybNameSuffix"` //银豹商品后缀 - JdsStockSwitch int8 `orm:"default(1)" json:"jdsStockSwitch"` //京东商城总库存 - PreparationTime int `orm:"default(1)" json:"preparationTime"` //商品准备时长 - BestSeller int `json:"bestSeller"` //畅销品 0不是 1是 - Video string `json:"video"` //商品视频地址 - VideoID string `orm:"column(video_id)" json:"videoID"` //商品视频美团ID - TiktokAttribute string `orm:"column(tiktok_attribute);size(512)" json:"tiktok_attribute"` //抖音分类属性的存储 + YbNameSuffix string `json:"ybNameSuffix"` //银豹商品后缀 + JdsStockSwitch int8 `orm:"default(1)" json:"jdsStockSwitch"` //京东商城总库存 + PreparationTime int `orm:"default(1)" json:"preparationTime"` //商品准备时长 + BestSeller int `json:"bestSeller"` //畅销品 0不是 1是 + Video string `json:"video"` //商品视频地址 + VideoID string `orm:"column(video_id)" json:"videoID"` //商品视频美团ID + TiktokAttribute string `orm:"column(tiktok_attribute);size(512)" json:"tiktokAttribute"` //抖音分类属性的存储 } func (*SkuName) TableUnique() [][]string { diff --git a/globals/refutil/refutil.go b/globals/refutil/refutil.go index e6c81127d..c12910e91 100644 --- a/globals/refutil/refutil.go +++ b/globals/refutil/refutil.go @@ -53,6 +53,7 @@ func DeSerializeData(strValue string, dataPtr interface{}) (err error) { return err } +// mapData 参数 obj 对象 // todo 这里看是否需要将key值转换成标准格式（即字母大写），因为beego orm不区分，不转换也可以 func FilterMapByStructObject(mapData map[string]interface{}, obj interface{}, objPtr interface{}, excludedFields []string, isCheckValue bool) (valid map[string]interface{}, invalid map[string]interface{}) { excludedMap := make(map[string]int) @@ -66,6 +67,8 @@ func FilterMapByStructObject(mapData map[string]interface{}, obj interface{}, ob if m[k] != nil && excludedMap[k] == 0 /*&& v != nil*/ && (!isCheckValue || !IsValueEqual(m[k], v)) { valid[k] = v m[k] = v + globals.SugarLogger.Debugf("m[k]====%s", utils.Format4Output(m[k], false)) + globals.SugarLogger.Debugf("valid[k] ====%s", utils.Format4Output(valid[k], false)) } else { invalid[k] = v } @@ -75,6 +78,9 @@ func FilterMapByStructObject(mapData map[string]interface{}, obj interface{}, ob globals.SugarLogger.Warnf("FilterMapByStructObject failed with err:%v, mapData:%s", err, utils.Format4Output(mapData, true)) } } + globals.SugarLogger.Debugf("m[valid]====%s", utils.Format4Output(valid, false)) + globals.SugarLogger.Debugf("m[invalid]====%s", utils.Format4Output(invalid, false)) + return valid, invalid }