From c53102acd72794fd5e4a74a55517a33cfffeed86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 19 Mar 2020 17:20:00 +0800 Subject: [PATCH] =?UTF-8?q?earningprice=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/orderman_ext.go | 4 ++-- business/jxcallback/scheduler/basesch/basesch_ext.go | 4 ++-- business/jxutils/jxutils.go | 4 ++-- business/model/dao/dao_order.go | 6 +++--- business/model/order.go | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 1e52774a4..b7a496dbb 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -670,7 +670,7 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID saleInfo.VendorPrice += v.VendorPrice * int64(v.Count) saleInfo.SalePrice += v.SalePrice * int64(v.Count) // saleInfo.EarningPrice += v.EarningPrice * int64(v.Count) - saleInfo.EarningPrice = v.EarningPrice2 + saleInfo.EarningPrice = v.NewEarningPrice universalOrderID := jxutils.ComposeUniversalOrderID(v.VendorOrderID, v.VendorID) if orderMap[universalOrderID] == nil { @@ -747,7 +747,7 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID saleInfo.SalePrice += v.SalePrice // saleInfo.EarningPrice += v.EarningPrice saleInfo.Count++ - saleInfo.EarningPrice = v.EarningPrice2 + saleInfo.EarningPrice = v.NewEarningPrice } for _, v := range saleInfoMap { saleInfoList = append(saleInfoList, v) diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index 0801a3f0a..4cc88ca45 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -40,8 +40,8 @@ func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, order * stores, _ := dao.GetStoreList(dao.GetDB(), []int{order.StoreID}, nil, nil, nil, "") if len(stores) > 0 { if stores[0].PayPercentage <= 50 { - order.EarningPrice2 = (order.TotalShopMoney - bill.DesiredFee) * int64((100 - stores[0].PayPercentage/2)) / 10000 - dao.UpdateEntity(dao.GetDB(), order, "EarningPrice2") + order.NewEarningPrice = (order.TotalShopMoney - bill.DesiredFee) * int64((100 - stores[0].PayPercentage/2)) / 10000 + dao.UpdateEntity(dao.GetDB(), order, "NewEarningPrice") } } globals.SugarLogger.Debugf("CreateWaybillOnProviders orderID:%s userName:%s vendorID:%d bill:%v", order.VendorOrderID, userName, courierVendorID, bill) diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go index 7b2a749b1..37c03ff91 100644 --- a/business/jxutils/jxutils.go +++ b/business/jxutils/jxutils.go @@ -542,9 +542,9 @@ func RefreshOrderSkuRelated(order *model.GoodsOrder) *model.GoodsOrder { func RefreshOrderEarningPrice2(order *model.GoodsOrder, payPercentage int) *model.GoodsOrder { if payPercentage <= 50 { - order.EarningPrice2 = order.TotalShopMoney * int64((100 - payPercentage/2)) / 10000 + order.NewEarningPrice = order.TotalShopMoney * int64((100 - payPercentage/2)) / 10000 } else { - order.EarningPrice2 = order.EarningPrice + order.NewEarningPrice = order.EarningPrice } return order } diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index 8ab89944b..8b3ab2dae 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -43,8 +43,8 @@ type OrderSkuWithActualPayPrice struct { StoreID int `orm:"column(store_id)" json:"storeID"` // 外部系统里记录的 jxstoreid Status int `json:"status"` // 参见OrderStatus*相关的常量定义 - PayPercentage int `json:"payPercentage"` - EarningPrice2 int64 `json:"earningPrice2"` + PayPercentage int `json:"payPercentage"` + NewEarningPrice int64 `json:"newEarningPrice"` } type tGoodsAndOrder struct { @@ -359,7 +359,7 @@ func GetStoreOrderSkuList(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAt // order_finished_at sql := ` SELECT t1.*, - IF(t2.jx_store_id > 0, t2.jx_store_id, t2.store_id) store_id, t2.status, t2.actual_pay_price, t2.distance_freight_money, t2.waybill_tip_money, t2.earning_price2, + IF(t2.jx_store_id > 0, t2.jx_store_id, t2.store_id) store_id, t2.status, t2.actual_pay_price, t2.distance_freight_money, t2.waybill_tip_money, t2.new_earning_price, t3.pay_percentage FROM order_sku t1 JOIN goods_order t2 ON t2.vendor_order_id = t1.vendor_order_id AND t2.vendor_id = t1.vendor_id diff --git a/business/model/order.go b/business/model/order.go index a5d66b33d..175171a9f 100644 --- a/business/model/order.go +++ b/business/model/order.go @@ -64,7 +64,7 @@ type GoodsOrder struct { DistanceFreightMoney int64 `json:"distanceFreightMoney"` // 商户承担的远距离配送费（当前只有京东到家有值） WaybillTipMoney int64 `json:"waybillTipMoney"` // 京西加的平台配送小费 EarningPrice int64 `json:"earningPrice"` // 结算给门店老板的钱（未扣除可能的三方配送费） - EarningPrice2 int64 `json:"earningPrice2"` // 结算给门店老板的钱（未扣除可能的三方配送费）(新规则) + NewEarningPrice int64 `json:"newEarningPrice"` // 结算给门店老板的钱（未扣除可能的三方配送费）(新规则) Weight int `json:"weight"` // 单位为克 VendorUserID string `orm:"column(vendor_user_id);size(48)" json:"vendorUserID"` UserID string `orm:"column(user_id);size(48);index" json:"userID"`