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

business/partner/purchase/mtwm/store_sku2.go

@@ -5,8 +5,6 @@ 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"
@@ -267,8 +265,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)
+		attr := switchAttr(storeSku.VendorVendorCatID)
+		if attr != "" {
+			foodData["common_attr_value"] = attr
 		}
 		catCode := tryCatName2Code(storeSku.VendorCatID)
 		if catCode != "" {
@@ -387,6 +386,8 @@ func switchAttr(vendorCatID int64) (attrs string) {
 		return mtwmapi.MtwmSkuAttr200002670
 	case 200002680:
 		return mtwmapi.MtwmSkuAttr200002680
+	default:
+		return ""
 	}
 	return attrs
 }