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

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

Browse Source
This commit is contained in:
苏尹岚
2019-12-13 16:55:10 +08:00
parent ebad9c1290 032bb05157
commit 3412f95380
2 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/jxstore/act/act.go
View File

@@ -138,7 +138,9 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
for _, vendorID := range vendorIDs { for _, vendorID := range vendorIDs {
storeDetail, err2 := dao.GetStoreDetail(db, storeID, vendorID) storeDetail, err2 := dao.GetStoreDetail(db, storeID, vendorID)
if err = err2; err == nil { if err = err2; err == nil {
if storeDetail.IsSync != 0 && storeDetail.Status != model.StoreStatusDisabled && storeDetail.VendorStatus != model.StoreStatusDisabled { if storeDetail.IsSync != 0 {
if act.Type == model.ActSkuFake ||
storeDetail.Status != model.StoreStatusDisabled && storeDetail.VendorStatus != model.StoreStatusDisabled {
for _, v := range oneStoreSkuParam { for _, v := range oneStoreSkuParam {
validVendorMap[vendorID] = 1 validVendorMap[vendorID] = 1
validSkuMap[v.SkuID] = 1 validSkuMap[v.SkuID] = 1
@@ -149,7 +151,6 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
SkuID: v.SkuID, SkuID: v.SkuID,
VendorID: vendorID, VendorID: vendorID,
} }
v.OriginalPrice = actSkuMap.VendorPrice
storeSkuInfo := storeSkuMap[jxutils.Combine2Int(v.StoreID, v.SkuID)] storeSkuInfo := storeSkuMap[jxutils.Combine2Int(v.StoreID, v.SkuID)]
if storeSkuInfo != nil { if storeSkuInfo != nil {
jxPrice := storeSkuInfo.Price jxPrice := storeSkuInfo.Price
@@ -195,6 +196,7 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
} }
wholeValidVendorMap[vendorID] = 1 wholeValidVendorMap[vendorID] = 1
} }
}
} else if !dao.IsNoRowsError(err) { } else if !dao.IsNoRowsError(err) {
return nil, nil, nil, err return nil, nil, nil, err
} else { } else {

6
business/partner/purchase/jd/sku2.go
View File

@@ -168,9 +168,9 @@ func skuInfo2Param(ctx *jxcontext.Context, sku *dao.StoreSkuSyncInfo) (param *jd
Images: jxutils.BatchString2Slice(sku.Img, sku.Img2), Images: jxutils.BatchString2Slice(sku.Img, sku.Img2),
} }
// 不为份的SKU，如果没有设置upc，自动生成一个假的 // 不为份的SKU，如果没有设置upc，自动生成一个假的
// if sku.Unit != model.SpecialUnit && param.Upc == "" { if sku.Unit != model.SpecialUnit && param.Upc == "" {
// param.Upc = jxutils.GenFakeUPC(sku.SkuID) param.Upc = jxutils.GenFakeUPC(sku.SkuID)
// } }
if param.CategoryID == 0 { if param.CategoryID == 0 {
param.CategoryID = int64(getDefJdCategoryID()) param.CategoryID = int64(getDefJdCategoryID())
} }