diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index d84c4a540..eef24edb7 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -128,24 +128,23 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac StoreID: storeID, SkuID: v.SkuID, VendorID: vendorID, - - SyncStatus: model.SyncFlagNewMask, } v.OriginalPrice = actSkuMap.VendorPrice - if storeSkuInfo := storeSkuMap[jxutils.Combine2Int(v.StoreID, v.SkuID)]; storeSkuInfo != nil { + storeSkuInfo := storeSkuMap[jxutils.Combine2Int(v.StoreID, v.SkuID)] + if storeSkuInfo != nil { jxPrice := storeSkuInfo.Price pricePercentage := jxutils.GetPricePercentage(storeDetail.PricePercentagePackObj, jxPrice, int(storeDetail.PricePercentage)) actSkuMap.VendorPrice = int64(jxutils.CaculateSkuVendorPrice(jxPrice, pricePercentage)) v.OriginalPrice = int64(jxPrice) - } else if act.Type != model.ActSkuFake { - v.ErrMsg = fmt.Sprintf("门店:%d没有关注商品:%d", v.StoreID, v.SkuID) - wrongSkuList = append(wrongSkuList, v) - continue } - if act.Type == model.ActSkuFake { - actSkuMap.ActualActPrice = 0 - actSkuMap.SyncStatus = 0 - } else { + var err2 error + if act.Type != model.ActSkuFake { + if storeSkuInfo == nil { + v.ErrMsg = fmt.Sprintf("门店:%d没有关注商品:%d", v.StoreID, v.SkuID) + wrongSkuList = append(wrongSkuList, v) + continue + } + actSkuMap.SyncStatus = model.SyncFlagNewMask if v.ActPrice != 0 { actSkuMap.ActualActPrice = v.ActPrice } else { @@ -161,15 +160,16 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac if actSkuMap.ActualActPrice <= 0 { actSkuMap.ActualActPrice = 1 } - if err2 := checkDiscountValidation(act.Type, int(actSkuMap.ActualActPrice*100/actSkuMap.VendorPrice)); err2 != nil { + if err2 = checkDiscountValidation(act.Type, int(actSkuMap.ActualActPrice*100/actSkuMap.VendorPrice)); err2 != nil { v.ErrMsg = err2.Error() v.ActualActPrice = actSkuMap.ActualActPrice wrongSkuList = append(wrongSkuList, v) - } else { - dao.WrapAddIDCULDEntity(actSkuMap, ctx.GetUserName()) - actStoreSkuMapList = append(actStoreSkuMapList, actSkuMap) } } + if err2 == nil { + dao.WrapAddIDCULDEntity(actSkuMap, ctx.GetUserName()) + actStoreSkuMapList = append(actStoreSkuMapList, actSkuMap) + } } wholeValidVendorMap[vendorID] = 1 } else if !dao.IsNoRowsError(err) {