Merge remote-tracking branch 'origin/jdshop' into qidongsheng

This commit is contained in:
平凡梦
2020-07-10 09:07:19 +08:00
3 changed files with 32 additions and 7 deletions

View File

@@ -4669,10 +4669,22 @@ func doStoreSkuAudit(ctx *jxcontext.Context, storeIDs []int, skuBindInfos []*Sto
return true, err
}
func StoreSkuPriceAudit(ctx *jxcontext.Context, storeSkuAudits []*model.StoreSkuAudit, status int, isAsync, isContinueWhenError bool) (hint string, err error) {
func StoreSkuPriceAudit(ctx *jxcontext.Context, storeSkuAudits []*model.StoreSkuAudit, status int, isAsync, isContinueWhenError bool) (storeSkuAudits2 []*model.StoreSkuAudit, hint string, err error) {
db := dao.GetDB()
if status == model.StoreAuditStatusOnline {
return "", fmt.Errorf("审核标志不正确!")
return nil, "", fmt.Errorf("审核标志不正确!")
}
//证明是预审核
if status == 2 {
for _, v := range storeSkuAudits {
skuList, _ := dao.GetStoreSkusByNameIDs(db, []int{v.StoreID}, v.NameID)
if len(skuList) > 0 {
if int64(v.AuditPrice) > skuList[0].UnitPrice*2 {
storeSkuAudits2 = append(storeSkuAudits2, v)
}
}
}
return storeSkuAudits2, "", err
}
task := tasksch.NewParallelTask("StoreSkuPriceAudit", tasksch.NewParallelConfig().SetParallelCount(5).SetIsContinueWhenError(isContinueWhenError), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
@@ -4751,5 +4763,5 @@ func StoreSkuPriceAudit(ctx *jxcontext.Context, storeSkuAudits []*model.StoreSku
_, err = task.GetResult(0)
hint = "1"
}
return hint, err
return nil, hint, err
}