From 662fd6d8b1214e083046ca463367b83756328097 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 26 Dec 2018 15:49:38 +0800
Subject: [PATCH] - use real sku spec as spu sale attr

---
 business/partner/purchase/jd/sku.go | 15 ++++++++-------
 controllers/financial.go            |  2 --
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/business/partner/purchase/jd/sku.go b/business/partner/purchase/jd/sku.go
index d26906762..a5576d030 100644
--- a/business/partner/purchase/jd/sku.go
+++ b/business/partner/purchase/jd/sku.go
@@ -358,7 +358,7 @@ func (p *PurchaseHandler) syncSkuNameAsSpu(db *dao.DaoDB, sku *model.Sku, skuExt
 		err = api.JdAPI.UpdateSkuBaseInfo(utils.Int2Str(skuExt.ID), utils.Int2Str(sku.ID), utils.Params2Map(jdapi.KeyFixedStatus, jdapi.SkuFixedStatusDeleted))
 	} else if sku.JdSyncStatus&model.SyncFlagNewMask != 0 && !jxutils.IsFakeID(skuNameJdID) { // 非首次新增SKU
 		if globals.EnableStoreWrite {
-			vendorSkuID2, err2 := api.JdAPI.AppendSku(utils.Int2Str(skuExt.ID), utils.Int2Str(sku.ID), skuExt.JdCategoryID, shopCategories, skuExt.BrandID, skuName, price, jxutils.IntWeight2Float(sku.Weight), []string{skuExt.Img}, jxStatus2jdStatus(sku.Status), true, nil)
+			vendorSkuID2, err2 := api.JdAPI.AppendSku(utils.Int2Str(skuExt.ID), utils.Int2Str(sku.ID), skuExt.JdCategoryID, shopCategories, skuExt.BrandID, skuName, price, jxutils.IntWeight2Float(sku.Weight), []string{skuExt.Img}, jxStatus2jdStatus(sku.Status), true, jxutils.ComposeSkuSpec(sku.SpecQuality, sku.SpecUnit), nil)
 			if err = err2; err == nil {
 				vendorSkuID = utils.Int64ToStr(vendorSkuID2)
 			}
@@ -396,12 +396,13 @@ func (p *PurchaseHandler) syncSkuNameAsSpu(db *dao.DaoDB, sku *model.Sku, skuExt
 				spuName := jxutils.ComposeSpuName(skuExt.Prefix, skuExt.Name, 0)
 				skus := []map[string]interface{}{
 					map[string]interface{}{
-						jdapi.KeyOutSkuId:    utils.Int2Str(sku.ID),
-						jdapi.KeySkuName:     skuName,
-						jdapi.KeyFixedStatus: jxStatus2jdStatus(sku.Status),
-						jdapi.KeySkuPrice:    price,
-						jdapi.KeyWeight:      jxutils.IntWeight2Float(sku.Weight),
-						jdapi.KeyIsSale:      true,
+						jdapi.KeyOutSkuId:     utils.Int2Str(sku.ID),
+						jdapi.KeySkuName:      skuName,
+						jdapi.KeyFixedStatus:  jxStatus2jdStatus(sku.Status),
+						jdapi.KeySkuPrice:     price,
+						jdapi.KeyWeight:       jxutils.IntWeight2Float(sku.Weight),
+						jdapi.KeyIsSale:       true,
+						jdapi.FakeKeySpecAttr: jxutils.ComposeSkuSpec(sku.SpecQuality, sku.SpecUnit),
 					},
 				}
 				if globals.EnableStoreWrite {
diff --git a/controllers/financial.go b/controllers/financial.go
index 2f5077644..d458e3330 100644
--- a/controllers/financial.go
+++ b/controllers/financial.go
@@ -68,7 +68,6 @@ func (c *FinancialController) GetStoreBills() {
 // @Failure 200 {object} controllers.CallResult
 // @router /ShowStoreLatestBill [get]
 func (c *FinancialController) ShowStoreLatestBill() {
-	var err2 error
 	var bills []*legacymodel.StoreBill
 	w := c.Ctx.ResponseWriter
 	w.Header().Add("Content-Type", "text/html")
@@ -85,7 +84,6 @@ func (c *FinancialController) ShowStoreLatestBill() {
 		} else {
 			htmlResult = fmt.Sprintf(html, bills[0].Url)
 		}
-		err2 = err
 		return retVal, model.ErrorCodeIgnore, err
 	})
 	if htmlResult != "" {