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

Accept Merge Request #185: (su -> mark)

Browse Source 
Merge Request: 分账修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/185
This commit is contained in:
苏尹岚
2020-02-13 16:27:12 +08:00
parent d3cf404a41 e46245f7e2
commit dd259a16e2
19 changed files with 417 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/cms/sync_store_sku.go
View File

@@ -414,7 +414,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
}
} else {
if sku.MergedStatus == model.SkuStatusNormal {
if dao.IsVendorThingIDEmpty(sku.VendorCatID) {
if dao.IsVendorThingIDEmpty(sku.VendorCatID) && !strings.Contains(sku.StoreName, model.ExdStoreName) {
globals.SugarLogger.Warnf("syncStoreSkuNew 创建门店:%d商品:%d，但没有平台分类ID", storeID, sku.SkuID)
} else {
createList = append(createList, sku)