This commit is contained in:
suyl
2021-06-11 09:58:48 +08:00
parent 2c25f3bfa3
commit b4688c4a77

View File

@@ -5339,24 +5339,6 @@ func StoreSkuPriceAudit(ctx *jxcontext.Context, storeSkuAudits []*model.StoreSku
task := tasksch.NewParallelTask("StoreSkuPriceAudit", tasksch.NewParallelConfig().SetParallelCount(5).SetIsContinueWhenError(isContinueWhenError), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
storeAudit := batchItemList[0].(*model.StoreSkuAudit)
if multiFlag {
var skuIDList []int
skuList, _ := dao.GetStoreSkusByNameIDs(db, []int{storeAudit.StoreID}, storeAudit.NameID)
if len(skuList) > 0 {
if int64(storeAudit.AuditPrice) > skuList[0].UnitPrice*2 {
return nil, fmt.Errorf("修改的价格超出原价格两倍请单个审核门店ID:[%v]商品nameID:[%v],商品名:[%v]", storeAudit.StoreID, storeAudit.NameID, skuList[0].Name)
}
for _, v := range skuList {
skuIDList = append(skuIDList, v.SkuID)
}
}
actList, _ := dao.QueryActs(db, 0, 0, 10, -1, "", -1, []int{model.ActStatusCreated},
[]int{model.ActSkuDirectDown, model.ActSkuSecKill, model.ActSkuDiscount}, nil, storeAudit.StoreID, skuIDList, 0,
time.Now().AddDate(0, -3, 0), time.Now(), utils.ZeroTimeValue, utils.ZeroTimeValue)
if len(actList.Data) > 0 {
return nil, fmt.Errorf("审核的商品正在做活动请单个审核活动ID:[%v]门店ID:[%v]商品nameID:[%v],商品名:[%v]", actList.Data[0].ID, storeAudit.StoreID, storeAudit.NameID, skuList[0].Name)
}
}
storeAudits, err := dao.GetStoreSkuAuditLight(db, []int{storeAudit.StoreID}, []int{storeAudit.NameID}, model.StoreAuditStatusOnline)
if len(storeAudits) == 0 || err != nil {
return retVal, err
@@ -5366,6 +5348,24 @@ func StoreSkuPriceAudit(ctx *jxcontext.Context, storeSkuAudits []*model.StoreSku
}
//审核通过
if status == model.StoreAuditStatusCreated {
if multiFlag {
var skuIDList []int
skuList, _ := dao.GetStoreSkusByNameIDs(db, []int{storeAudit.StoreID}, storeAudit.NameID)
if len(skuList) > 0 {
if int64(storeAudit.AuditPrice) > skuList[0].UnitPrice*2 {
return nil, fmt.Errorf("修改的价格超出原价格两倍请单个审核门店ID:[%v]商品nameID:[%v],商品名:[%v]", storeAudit.StoreID, storeAudit.NameID, skuList[0].Name)
}
for _, v := range skuList {
skuIDList = append(skuIDList, v.SkuID)
}
}
actList, _ := dao.QueryActs(db, 0, 0, 10, -1, "", -1, []int{model.ActStatusCreated},
[]int{model.ActSkuDirectDown, model.ActSkuSecKill, model.ActSkuDiscount}, nil, storeAudit.StoreID, skuIDList, 0,
time.Now().AddDate(0, -3, 0), time.Now(), utils.ZeroTimeValue, utils.ZeroTimeValue)
if len(actList.Data) > 0 {
return nil, fmt.Errorf("审核的商品正在做活动请单个审核活动ID:[%v]门店ID:[%v]商品nameID:[%v],商品名:[%v]", actList.Data[0].ID, storeAudit.StoreID, storeAudit.NameID, skuList[0].Name)
}
}
storeAudits[0].UserID = ctx.GetUserID()
storeAudits[0].Status = model.StoreAuditStatusCreated
storeAudits[0].Remark = storeAudit.Remark