liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

直营店始终按比例结算

Browse Source
This commit is contained in:
gazebo
2019-11-21 18:14:55 +08:00
parent 9dda86169b
commit 3a032c18cd
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
business/jxcallback/orderman/order.go
View File

@@ -303,7 +303,7 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao
return isDuplicated, err 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) globals.SugarLogger.Debugf("updateOrderSkuOtherInfo orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID)
jxStoreID := jxutils.GetShowStoreIDFromOrder(order) jxStoreID := jxutils.GetShowStoreIDFromOrder(order)
var opNumStr string 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) v.EarningPrice = jxutils.CaculateSkuEarningPrice(v.ShopPrice, v.SalePrice, storePayPercentage)
} }
updateSingleOrderEarningPrice(order, db) // 直营店始终按比例结算
if changePriceType != model.StoreChangePriceTypeManagedStore {
updateSingleOrderEarningPrice(order, db)
}
} }
return nil 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) globals.SugarLogger.Debugf("updateOrderOtherInfo orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID)
payPercentage := 0 payPercentage := 0
changePriceType := model.StoreChangePriceTypeDirect
storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, order.VendorStoreID, order.VendorID) storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, order.VendorStoreID, order.VendorID)
if err != nil { if err != nil {
if !dao.IsNoRowsError(err) { if !dao.IsNoRowsError(err) {
@@ -422,8 +426,9 @@ func (c *OrderManager) updateOrderOtherInfo(order *model.GoodsOrder, db *dao.Dao
} else { } else {
order.JxStoreID = storeDetail.Store.ID order.JxStoreID = storeDetail.Store.ID
payPercentage = storeDetail.PayPercentage 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) jxutils.RefreshOrderSkuRelated(order)
// caculateOrderEarningPrice(order, payPercentage) // caculateOrderEarningPrice(order, payPercentage)
} }

6
business/model/store.go
View File

@@ -236,9 +236,9 @@ var (
StoreAuditStatusRejected: "拒绝", StoreAuditStatusRejected: "拒绝",
} }
StorePriceTypeName = map[int]string{ StorePriceTypeName = map[int]string{
StoreChangePriceTypeDirect: "可直接改价", StoreChangePriceTypeDirect: "普通门店",
StoreChangePriceTypeBossDisabled: "禁止改价", StoreChangePriceTypeBossDisabled: "普通门店禁止改价",
StoreChangePriceTypeManagedStore: "直营门店", StoreChangePriceTypeManagedStore: "直营门店禁止改价",
} }
) )