From a1c53cebac4c2080afadf57c6f8964a8dd854bd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 17 Jun 2020 16:57:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9E=9C=E5=9B=ADdiff?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go            | 23 ++++++++++++++++++--
 business/partner/purchase/mtwm/store_sku2.go |  5 +++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 682541b9b..0e7ae9133 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -13,6 +13,8 @@ import (
 	"time"
 	"unicode"
 
+	"github.com/astaxie/beego"
+
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
 
 	"git.rosy.net.cn/jx-callback/globals/api"
@@ -843,8 +845,7 @@ func UpdateStoreSkus(ctx *jxcontext.Context, causeFlag, storeID int, skuBindInfo
 
 func UpdateStoresSkus(ctx *jxcontext.Context, causeFlag int, storeIDs []int, skuBindInfos []*StoreSkuBindInfo, isScale, isRefreshHigh, isAsync, isContinueWhenError bool) (hint string, err error) {
 	globals.SugarLogger.Debugf("UpdateStoresSkus:%s, storeIDs:%v, skuBindInfos:%s", ctx.GetTrackInfo(), storeIDs, utils.Format4Output(skuBindInfos, true))
-	flag, err := doStoreSkuAudit(ctx, storeIDs, skuBindInfos)
-	if !flag {
+	if beego.BConfig.RunMode == "jxgy" {
 		var num int64
 		db := dao.GetDB()
 		skuIDs, err := updateStoresSkusWithoutSync(ctx, db, storeIDs, skuBindInfos, isScale, isRefreshHigh)
@@ -859,6 +860,24 @@ func UpdateStoresSkus(ctx *jxcontext.Context, causeFlag int, storeIDs []int, sku
 		if num == 0 || !isAsync || hint == "" {
 			hint = utils.Int64ToStr(num)
 		}
+	} else {
+		flag, _ := doStoreSkuAudit(ctx, storeIDs, skuBindInfos)
+		if !flag {
+			var num int64
+			db := dao.GetDB()
+			skuIDs, err := updateStoresSkusWithoutSync(ctx, db, storeIDs, skuBindInfos, isScale, isRefreshHigh)
+			if err != nil {
+				return "", err
+			}
+			isAsync = asyncStoreSkuOpFilter(ctx, isAsync)
+			num = int64(len(skuIDs))
+			if num > 0 {
+				hint, err = CurVendorSync.SyncStoresSkus(ctx, nil, causeFlag, db, nil, storeIDs, skuIDs, false, isAsync, isContinueWhenError)
+			}
+			if num == 0 || !isAsync || hint == "" {
+				hint = utils.Int64ToStr(num)
+			}
+		}
 	}
 	return hint, err
 }
diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go
index 711a1c88c..051bcbef1 100644
--- a/business/partner/purchase/mtwm/store_sku2.go
+++ b/business/partner/purchase/mtwm/store_sku2.go
@@ -5,6 +5,8 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/astaxie/beego"
+
 	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
@@ -265,6 +267,9 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 		foodData["unit"] = storeSku.Unit
 		foodData["box_num"] = 1
 		foodData["box_price"] = jxutils.IntPrice2Standard(storeSku.BoxFee)
+		if beego.BConfig.RunMode == "jxgy" {
+			foodData["common_attr_value"] = switchAttr(storeSku.VendorVendorCatID)
+		}
 		catCode := tryCatName2Code(storeSku.VendorCatID)
 		if catCode != "" {
 			foodData["category_code"] = catCode