1

business/model/dao/sku.go

@@ -218,27 +218,6 @@ 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 {

business/model/dao/store_sku.go

@@ -208,12 +208,18 @@ type StoreSkuNameExt2 struct {
 
 	CategoryID int `orm:"column(category_id);index" json:"categoryID"` // 标准类别
 
-	Unit        string  `orm:"size(8)" json:"unit"`
+	Unit         string  `orm:"size(8)" json:"unit"`
-	SpecQuality float32 `json:"-"`               // 为份必然为500，这个主要作用只是用于确保SkuName的唯一性
+	SpecQuality  float32 `json:"-"`                            // 为份必然为500，这个主要作用只是用于确保SkuName的唯一性
-	SpecUnit    string  `orm:"size(8)" json:"-"` // 为份必然为克，这个主要作用只是用于确保SkuName的唯一性
+	SpecUnit     string  `orm:"size(8)" json:"-"`              // 为份必然为克，这个主要作用只是用于确保SkuName的唯一性
-	Price       int     `json:"price"`           // 单位为分，标准价，不为份的就为实际标准价，为份的为每市斤价，实际还要乘质量。todo 为份的确定必须有质量
+	Price        int     `json:"price"`                        // 单位为分，标准价，不为份的就为实际标准价，为份的为每市斤价，实际还要乘质量。todo 为份的确定必须有质量
-	Img         string  `orm:"size(512)" json:"img"`
+	Img          string  `orm:"size(512)" json:"img"`          //
-	Status      int     `orm:"default(1)" json:"status"` // skuname状态，取值同sku.Status
+	Img2         string  `orm:"size(512)" json:"img2"`         // 第二张图片
+	Img3         string  `orm:"size(512)" json:"img3"`         //第三张图片
+	Img4         string  `orm:"size(512)" json:"img4"`         //第三张图片
+	Img5         string  `orm:"size(512)" json:"img5"`         //第三张图片
+	ImgWatermark string  `orm:"size(512)" json:"imgWatermark"` //图片水印
+	ImgMix       string  `orm:"size(512)" json:"imgMix"`       //图片混合水印的图片
+	DescImg      string  `orm:"size(255)" json:"descImg"`      // 商品详情图片描述	Status      int     `orm:"default(1)" json:"status"` // skuname状态，取值同sku.Status
 
 	YbNameSuffix  string         `json:"ybNameSuffix"` //银豹商品后缀
 	StoreID       int            `orm:"column(store_id)" json:"storeID"`

business/partner/purchase/ebai/store_sku2.go

@@ -419,11 +419,12 @@ func (p *PurchaseHandler) UpdateStoreSkusStock(ctx *jxcontext.Context, vendorOrg
 func genSkuParamsFromStoreSkuInfo2(storeSku *dao.StoreSkuSyncInfo, isCreate, isExd bool) (params map[string]interface{}) {
 	var img string
 	var imgdata []byte
-	//if storeSku.ImgMix != "" && ((storeSku.BrandID == storeSku.ExBrandID && storeSku.ExBrandID != 0) || storeSku.ExBrandID == 0) {
+
-	//	img = storeSku.ImgMix
+	// PictureUpload 会被限流,但是通过此接口上传的商品不会异步操作会直接展示
-	//} else {
+	img, err := api.EbaiAPI.PictureUpload(storeSku.Img, imgdata)
-	img, _ = api.EbaiAPI.PictureUpload(storeSku.Img, imgdata)
+	if err != nil {
-	//}
+		img = storeSku.Img
+	}
 	photos := []map[string]interface{}{
 		map[string]interface{}{
 			"is_master": 1,

controllers/bidding.go

@@ -300,51 +300,3 @@ func (c *BiddingController) UpdateStockBySkuID() {
 		return
 	})
 }
-
-// RefreshSkuNameMTAAttr 更新商品库美团属性进口为国产
-// @Title 更新商品库美团属性进口为国产
-// @Description 批量更新库存
-// @Param	token			header			string	    true	"认证token"
-// @Success 200 {object} controllers.CallResult
-// @Failure 200 {object} controllers.CallResult
-// @router /RefreshSkuNameMTAAttr [get]
-func (c *BiddingController) RefreshSkuNameMTAAttr() {
-	c.callRefreshSkuNameMTAAttr(func(params *tBindRefreshSkuNameMTAAttrParams) (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 = "国产"
-							break
-						}
-					}
-					break
-				}
-			}
-			byteV2, _ := json.Marshal(attr)
-			dao.UpdateSkuNameMtAttr(db, int64(v.ID), string(byteV2))
-		}
-		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"`
-}

routers/commentsRouter_controllers.go

@@ -4506,16 +4506,6 @@ 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:           "RefreshSkuNameMTAAttr",
-			Router:           `/RefreshSkuNameMTAAttr`,
-			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{