From 61570289a2d056feab54464f7239bf468748e741 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 20 Nov 2019 09:12:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=B4=BB=E5=8A=A8=E6=8A=98?= =?UTF-8?q?=E6=89=A3=E6=A3=80=E6=9F=A5=E5=A4=B1=E8=B4=A5=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=B9=B3=E5=8F=B0=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/act/act.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index 60b6aa224..da94f2567 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -34,6 +34,7 @@ type ActStoreSkuParam struct { model.ActStoreSku ActualActPrice int64 `json:"actualActPrice,omitempty"` // 单品级活动用，创建活动时商品的活动价格 + VendorPrice int64 `json:"vendorPrice,omitempty"` // 创建活动时的平台价格 ErrMsg string `json:"errMsg,omitempty"` } @@ -149,6 +150,7 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac jxPrice := storeSkuInfo.Price actSkuMap.VendorPrice = int64(getVendorPriceFromStoreSkuBind(storeSkuInfo, vendorID)) v.OriginalPrice = int64(jxPrice) + v.OriginalPrice = actSkuMap.VendorPrice // 暂时返回平台价 } var err2 error if act.Type != model.ActSkuFake { // 非结算，要计算实际活动价格 @@ -176,6 +178,7 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac if err2 = checkDiscountValidation(act.Type, float64(actSkuMap.ActualActPrice)*100/float64(actSkuMap.VendorPrice)); err2 != nil { v.ErrMsg = err2.Error() v.ActualActPrice = actSkuMap.ActualActPrice + v.VendorPrice = actSkuMap.VendorPrice wrongSkuList = append(wrongSkuList, v) } }