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

修复今天改结算引入的bug

Browse Source
This commit is contained in:
gazebo
2019-11-04 20:55:49 +08:00
parent 6f23e9087b
commit 9cbfa6f6ef
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,24 +128,23 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
StoreID: storeID, StoreID: storeID,
SkuID: v.SkuID, SkuID: v.SkuID,
VendorID: vendorID, VendorID: vendorID,
SyncStatus: model.SyncFlagNewMask,
} }
v.OriginalPrice = actSkuMap.VendorPrice 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 jxPrice := storeSkuInfo.Price
pricePercentage := jxutils.GetPricePercentage(storeDetail.PricePercentagePackObj, jxPrice, int(storeDetail.PricePercentage)) pricePercentage := jxutils.GetPricePercentage(storeDetail.PricePercentagePackObj, jxPrice, int(storeDetail.PricePercentage))
actSkuMap.VendorPrice = int64(jxutils.CaculateSkuVendorPrice(jxPrice, pricePercentage)) actSkuMap.VendorPrice = int64(jxutils.CaculateSkuVendorPrice(jxPrice, pricePercentage))
v.OriginalPrice = int64(jxPrice) v.OriginalPrice = int64(jxPrice)
} else if act.Type != model.ActSkuFake { }
var err2 error
if act.Type != model.ActSkuFake {
if storeSkuInfo == nil {
v.ErrMsg = fmt.Sprintf("门店:%d没有关注商品:%d", v.StoreID, v.SkuID) v.ErrMsg = fmt.Sprintf("门店:%d没有关注商品:%d", v.StoreID, v.SkuID)
wrongSkuList = append(wrongSkuList, v) wrongSkuList = append(wrongSkuList, v)
continue continue
} }
if act.Type == model.ActSkuFake { actSkuMap.SyncStatus = model.SyncFlagNewMask
actSkuMap.ActualActPrice = 0
actSkuMap.SyncStatus = 0
} else {
if v.ActPrice != 0 { if v.ActPrice != 0 {
actSkuMap.ActualActPrice = v.ActPrice actSkuMap.ActualActPrice = v.ActPrice
} else { } else {
@@ -161,16 +160,17 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
if actSkuMap.ActualActPrice <= 0 { if actSkuMap.ActualActPrice <= 0 {
actSkuMap.ActualActPrice = 1 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.ErrMsg = err2.Error()
v.ActualActPrice = actSkuMap.ActualActPrice v.ActualActPrice = actSkuMap.ActualActPrice
wrongSkuList = append(wrongSkuList, v) wrongSkuList = append(wrongSkuList, v)
} else { }
}
if err2 == nil {
dao.WrapAddIDCULDEntity(actSkuMap, ctx.GetUserName()) dao.WrapAddIDCULDEntity(actSkuMap, ctx.GetUserName())
actStoreSkuMapList = append(actStoreSkuMapList, actSkuMap) actStoreSkuMapList = append(actStoreSkuMapList, actSkuMap)
} }
} }
}
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