From eb9560cfad95f668d0323c49734c9ca57eca8019 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Tue, 2 Jun 2020 18:12:03 +0800 Subject: [PATCH] ceshi --- business/jxstore/cms/store_sku.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 0f1f93f70..95ca33e1c 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -4481,10 +4481,8 @@ func GetStoreSkuAudit(ctx *jxcontext.Context, storeIDs, nameIDs, skuIDs, statuss func doStoreSkuAudit(ctx *jxcontext.Context, storeIDs []int, skuBindInfos []*StoreSkuBindInfo) (isAudit bool, err error) { globals.SugarLogger.Debugf("doStoreSkuAudit storeIDs: %v", storeIDs) db := dao.GetDB() - globals.SugarLogger.Debugf("doStoreSkuAudit skuBindInfos: %v", utils.Format4Output(skuBindInfos, false)) for _, storeID := range storeIDs { for _, skuBindInfo := range skuBindInfos { - globals.SugarLogger.Debugf("doStoreSkuAudit storeID : %v nameID: %v", storeID, skuBindInfo.NameID) storeAudits, err := dao.GetStoreSkuAuditLight(db, []int{storeID}, []int{skuBindInfo.NameID}, model.StoreAuditStatusOnline) //取消关注，可售排除 if skuBindInfo.IsFocus == -1 || skuBindInfo.IsSale != 0 || skuBindInfo.UnitPrice == 0 { @@ -4543,15 +4541,27 @@ func doStoreSkuAudit(ctx *jxcontext.Context, storeIDs []int, skuBindInfos []*Sto storeAudits[0].DeletedAt = time.Now() dao.UpdateEntity(db, storeAudits[0], "DeletedAt") } + globals.SugarLogger.Debugf("doStoreSkuAudit 444: %v", storeIDs) } } else { + globals.SugarLogger.Debugf("doStoreSkuAudit 333: %v", storeIDs) return false, fmt.Errorf("未查询到该门店商品价，storeID: %v, nameID: %V", storeID, skuBindInfo.NameID) } + globals.SugarLogger.Debugf("doStoreSkuAudit 222: %v", storeIDs) storeSkuAudit.Type = model.StoreSkuAuditTypePrice storeSkuAudit.OriginUnitPrice = int(storeSkus[0].UnitPrice) } + dao.Begin(db) + defer func() { + if r := recover(); r != nil { + dao.Rollback(db) + panic(r) + } + }() + globals.SugarLogger.Debugf("doStoreSkuAudit 111: %v", storeIDs) dao.WrapAddIDCULDEntity(storeSkuAudit, ctx.GetUserName()) err = dao.CreateEntity(db, storeSkuAudit) + dao.Commit(db) } } return true, err