liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
qidongsheng
2020-06-30 08:43:55 +08:00
parent a6c7c1e7dd 31cc598455
commit cb376af57d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/partner/purchase/mtwm/store_sku2.go
View File

@@ -5,8 +5,6 @@ import (
"regexp" "regexp"
"strings" "strings"
"github.com/astaxie/beego"
"git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/baseapi/platformapi/mtwmapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils" "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["unit"] = storeSku.Unit
foodData["box_num"] = 1 foodData["box_num"] = 1
foodData["box_price"] = jxutils.IntPrice2Standard(storeSku.BoxFee) foodData["box_price"] = jxutils.IntPrice2Standard(storeSku.BoxFee)
if beego.BConfig.RunMode == "jxgy" { attr := switchAttr(storeSku.VendorVendorCatID)
foodData["common_attr_value"] = switchAttr(storeSku.VendorVendorCatID) if attr != "" {
foodData["common_attr_value"] = attr
} }
catCode := tryCatName2Code(storeSku.VendorCatID) catCode := tryCatName2Code(storeSku.VendorCatID)
if catCode != "" { if catCode != "" {
@@ -387,6 +386,8 @@ func switchAttr(vendorCatID int64) (attrs string) {
return mtwmapi.MtwmSkuAttr200002670 return mtwmapi.MtwmSkuAttr200002670
case 200002680: case 200002680:
return mtwmapi.MtwmSkuAttr200002680 return mtwmapi.MtwmSkuAttr200002680
default:
return ""
} }
return attrs return attrs
} }