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

创建结算活动不判断门店状态

Browse Source
This commit is contained in:
gazebo
2019-12-13 16:40:37 +08:00
parent 5a37a9cf28
commit 7615cfa6bc
1 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,62 +138,64 @@ 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 {
for _, v := range oneStoreSkuParam { if act.Type == model.ActSkuFake ||
validVendorMap[vendorID] = 1 storeDetail.Status != model.StoreStatusDisabled && storeDetail.VendorStatus != model.StoreStatusDisabled {
validSkuMap[v.SkuID] = 1 for _, v := range oneStoreSkuParam {
v.ActID = act.ID validVendorMap[vendorID] = 1
actSkuMap := &model.ActStoreSkuMap{ validSkuMap[v.SkuID] = 1
ActID: act.ID, v.ActID = act.ID
StoreID: storeID, actSkuMap := &model.ActStoreSkuMap{
SkuID: v.SkuID, ActID: act.ID,
VendorID: vendorID, StoreID: storeID,
} SkuID: v.SkuID,
v.OriginalPrice = actSkuMap.VendorPrice VendorID: vendorID,
storeSkuInfo := storeSkuMap[jxutils.Combine2Int(v.StoreID, v.SkuID)]
if storeSkuInfo != nil {
jxPrice := storeSkuInfo.Price
actSkuMap.VendorPrice = int64(getVendorPriceFromStoreSkuBind(storeSkuInfo, vendorID))
v.OriginalPrice = int64(jxPrice)
}
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
} }
if !(vendorID == model.VendorIDJX || act.Type == model.ActSkuFake) { storeSkuInfo := storeSkuMap[jxutils.Combine2Int(v.StoreID, v.SkuID)]
actSkuMap.SyncStatus = model.SyncFlagNewMask if storeSkuInfo != nil {
jxPrice := storeSkuInfo.Price
actSkuMap.VendorPrice = int64(getVendorPriceFromStoreSkuBind(storeSkuInfo, vendorID))
v.OriginalPrice = int64(jxPrice)
} }
if v.ActPrice != 0 { var err2 error
actSkuMap.ActualActPrice = v.ActPrice if act.Type != model.ActSkuFake { // 非结算，要计算实际活动价格
} else { if storeSkuInfo == nil {
percentage := act.PricePercentage v.ErrMsg = fmt.Sprintf("门店:%d没有关注商品:%d", v.StoreID, v.SkuID)
if v.PricePercentage != 0 { wrongSkuList = append(wrongSkuList, v)
percentage = v.PricePercentage continue
} }
actSkuMap.ActualActPrice = int64(jxutils.CaculateSkuVendorPrice(int(actSkuMap.VendorPrice), percentage, 0)) if !(vendorID == model.VendorIDJX || act.Type == model.ActSkuFake) {
if actSkuMap.ActualActPrice > 10 { actSkuMap.SyncStatus = model.SyncFlagNewMask
actSkuMap.ActualActPrice = int64(math.Floor(float64(actSkuMap.ActualActPrice)/10) * 10) }
if v.ActPrice != 0 {
actSkuMap.ActualActPrice = v.ActPrice
} else {
percentage := act.PricePercentage
if v.PricePercentage != 0 {
percentage = v.PricePercentage
}
actSkuMap.ActualActPrice = int64(jxutils.CaculateSkuVendorPrice(int(actSkuMap.VendorPrice), percentage, 0))
if actSkuMap.ActualActPrice > 10 {
actSkuMap.ActualActPrice = int64(math.Floor(float64(actSkuMap.ActualActPrice)/10) * 10)
}
}
if actSkuMap.ActualActPrice <= 0 {
actSkuMap.ActualActPrice = 1
}
if err2 = checkDiscountValidation(vendorIDs, act.Type, float64(actSkuMap.ActualActPrice)*100/float64(actSkuMap.VendorPrice)); err2 != nil {
v.ErrMsg = err2.Error()
v.ActualActPrice = actSkuMap.ActualActPrice
v.VendorPrice = actSkuMap.VendorPrice
wrongSkuList = append(wrongSkuList, v)
} }
} }
if actSkuMap.ActualActPrice <= 0 { if err2 == nil {
actSkuMap.ActualActPrice = 1 dao.WrapAddIDCULDEntity(actSkuMap, ctx.GetUserName())
} actStoreSkuMapList = append(actStoreSkuMapList, actSkuMap)
if err2 = checkDiscountValidation(vendorIDs, act.Type, float64(actSkuMap.ActualActPrice)*100/float64(actSkuMap.VendorPrice)); err2 != nil {
v.ErrMsg = err2.Error()
v.ActualActPrice = actSkuMap.ActualActPrice
v.VendorPrice = actSkuMap.VendorPrice
wrongSkuList = append(wrongSkuList, v)
} }
} }
if err2 == nil { wholeValidVendorMap[vendorID] = 1
dao.WrapAddIDCULDEntity(actSkuMap, ctx.GetUserName())
actStoreSkuMapList = append(actStoreSkuMapList, actSkuMap)
}
} }
wholeValidVendorMap[vendorID] = 1
} }
} else if !dao.IsNoRowsError(err) { } else if !dao.IsNoRowsError(err) {
return nil, nil, nil, err return nil, nil, nil, err