Merge remote-tracking branch 'origin/mark' into jdshop

business/partner/purchase/jdshop/store_sku.go

@@ -148,7 +148,7 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 				} else {
 					err = api.JdShopAPI.ImageUpdate(v.JdsWareID, 2, pic1)
 				}
-
+				err = api.JdShopAPI.ImageUpdate(v.JdsWareID, 3, pic1)
 			}
 			var features = []*jdshopapi.CreateSkuParamFeatures{
 				&jdshopapi.CreateSkuParamFeatures{
@@ -473,7 +473,11 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		Weight:     0.5,
 		JdPrice:    jxutils.IntPrice2Standard(storeSku.UnitPrice),
 		// MarketPrice: jxutils.IntPrice2Standard(storeSku.UnitPrice),
-		PromiseID: jdshopapi.JdsPromiseID,
+		// PromiseID: jdshopapi.JdsPromiseID,
+	}
+
+	if storeSku.VendorVendorCatID != jdshopapi.JdsOtherMeatCatID {
+		createSkuParamWare.PromiseID = jdshopapi.JdsPromiseID
 	}
 
 	//上传京东图片
@@ -495,10 +499,15 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		err = err2
 		img2.ImgURL = pic2
 	}
+	img3 := &jdshopapi.CreateSkuParamImages{
+		ColorID:  "0000000000",
+		ImgIndex: 3,
+		ImgURL:   pic1,
+	}
 	images = append(images, img1)
 	images = append(images, img2)
+	images = append(images, img3)
 	createSkuParamWare.Images = images
-
 	//商品详情拼接
 	var desc string
 	if storeSku.DescImg != "" {
@@ -517,6 +526,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		zctjValueID int64                  //贮存条件冷藏0-4的id
 		gcjkValueID int64                  //国产，进口的id
 		lbValueID   int64                  //类别的ID
+		bcztValueID int64                  //保存状态ID
 		attrsProp   []*jdshopapi.CreateSkuParamAttrs
 	)
 	attrs, err := api.JdShopAPI.FindAttrs(int(storeSku.VendorVendorCatID))
@@ -533,6 +543,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["贮存条件"])
@@ -555,6 +567,20 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		}
 		attrsProp = append(attrsProp, attrgcjk)
 	}
+	if attrIDs["保存状态"] != 0 {
+		values2, _, err2 := api.JdShopAPI.FindValuesByAttrId(attrIDs["保存状态"])
+		err = err2
+		for _, v := range values2 {
+			if v.Name == "冷藏" || v.Name == "活鲜" {
+				bcztValueID = v.ID
+			}
+		}
+		attrbczt := &jdshopapi.CreateSkuParamAttrs{
+			AttrID:     utils.Int2Str(attrIDs["保存状态"]),
+			AttrValues: []string{utils.Int64ToStr(bcztValueID)},
+		}
+		attrsProp = append(attrsProp, attrbczt)
+	}
 	attrZctj := &jdshopapi.CreateSkuParamAttrs{
 		AttrID:     utils.Int2Str(attrIDs["贮存条件"]),
 		AttrValues: []string{utils.Int64ToStr(zctjValueID)},