From 21977636951e0f904f612c367c98451b0340abba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 1 Jun 2020 10:18:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=A8=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store_sku.go | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 0ee349def..b60b21909 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -4545,10 +4545,10 @@ func StoreSkuPriceAudit(ctx *jxcontext.Context, storeSkuAudits []*model.StoreSku if len(storeAudits) > 1 { return retVal, fmt.Errorf("查询到该门店该商品的待审核信息大于1条!storeID: %v, nameID: %v", storeAudit.StoreID, storeAudit.NameID) } - // flag := false + flag := false //审核通过 if status == model.StoreAuditStatusCreated { - // flag = true + flag = true storeAudits[0].UserID = ctx.GetUserID() storeAudits[0].Status = model.StoreAuditStatusCreated storeAudits[0].Remark = storeAudit.Remark @@ -4592,18 +4592,19 @@ func StoreSkuPriceAudit(ctx *jxcontext.Context, storeSkuAudits []*model.StoreSku return retVal, fmt.Errorf("审核标志不正确!") } if err == nil { - // skuAndNames, err := dao.GetSkus(db, nil, []int{v}, nil, nil, nil) - // if len(skuAndNames) > 0 && err == nil { - // price := 0 - // if auditPrice != 0 { - // price = auditPrice - // } else { - // price = storeAudits[0].UnitPrice - // } - // weixinmsg.NotifyStoreOpRequestStatus(flag, storeID, v, jxutils.ComposeSpuName(skuAndNames[0].Prefix, skuAndNames[0].Name, 0), storeAudits[0].OriginUnitPrice, price, remark) - // } + if !globals.IsProductEnv() { + skuAndNames, err := dao.GetSkus(db, nil, []int{storeAudit.NameID}, nil, nil, nil) + if len(skuAndNames) > 0 && err == nil { + price := 0 + if storeAudit.AuditPrice != 0 { + price = storeAudit.AuditPrice + } else { + price = storeAudits[0].UnitPrice + } + weixinmsg.NotifyStoreOpRequestStatus(flag, storeAudit.StoreID, storeAudit.NameID, jxutils.ComposeSpuName(skuAndNames[0].Prefix, skuAndNames[0].Name, 0), storeAudits[0].OriginUnitPrice, price, storeAudit.Remark) + } + } } - return retVal, err }, storeSkuAudits) tasksch.HandleTask(task, nil, true).Run()