From 3a032c18cdff370ef2d80f8e02ff9941cf2703fe Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 21 Nov 2019 18:14:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E8=90=A5=E5=BA=97=E5=A7=8B=E7=BB=88?= =?UTF-8?q?=E6=8C=89=E6=AF=94=E4=BE=8B=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/order.go | 11 ++++++++--- business/model/store.go | 6 +++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index f80328328..42d1f9332 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -303,7 +303,7 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao return isDuplicated, err } -func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.DaoDB, storePayPercentage int) (err error) { +func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.DaoDB, storePayPercentage, changePriceType int) (err error) { globals.SugarLogger.Debugf("updateOrderSkuOtherInfo orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID) jxStoreID := jxutils.GetShowStoreIDFromOrder(order) var opNumStr string @@ -374,7 +374,10 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao. } v.EarningPrice = jxutils.CaculateSkuEarningPrice(v.ShopPrice, v.SalePrice, storePayPercentage) } - updateSingleOrderEarningPrice(order, db) + // 直营店始终按比例结算 + if changePriceType != model.StoreChangePriceTypeManagedStore { + updateSingleOrderEarningPrice(order, db) + } } return nil } @@ -409,6 +412,7 @@ func (c *OrderManager) updateOrderOtherInfo(order *model.GoodsOrder, db *dao.Dao globals.SugarLogger.Debugf("updateOrderOtherInfo orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID) payPercentage := 0 + changePriceType := model.StoreChangePriceTypeDirect storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, order.VendorStoreID, order.VendorID) if err != nil { if !dao.IsNoRowsError(err) { @@ -422,8 +426,9 @@ func (c *OrderManager) updateOrderOtherInfo(order *model.GoodsOrder, db *dao.Dao } else { order.JxStoreID = storeDetail.Store.ID payPercentage = storeDetail.PayPercentage + changePriceType = int(storeDetail.ChangePriceType) } - if err = c.updateOrderSkuOtherInfo(order, db, payPercentage); err == nil { + if err = c.updateOrderSkuOtherInfo(order, db, payPercentage, changePriceType); err == nil { jxutils.RefreshOrderSkuRelated(order) // caculateOrderEarningPrice(order, payPercentage) } diff --git a/business/model/store.go b/business/model/store.go index 8b549576a..0250028f4 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -236,9 +236,9 @@ var ( StoreAuditStatusRejected: "拒绝", } StorePriceTypeName = map[int]string{ - StoreChangePriceTypeDirect: "可直接改价", - StoreChangePriceTypeBossDisabled: "禁止改价", - StoreChangePriceTypeManagedStore: "直营门店", + StoreChangePriceTypeDirect: "普通门店", + StoreChangePriceTypeBossDisabled: "普通门店禁止改价", + StoreChangePriceTypeManagedStore: "直营门店禁止改价", } )