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

去除realEarningPrice

Browse Source
This commit is contained in:
gazebo
2019-12-17 09:35:28 +08:00
parent 5363e34209
commit 9e1ec73200
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxcallback/orderman/orderman_ext.go
View File

@@ -96,8 +96,7 @@ func (c *OrderManager) GetOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID str
t1.sku_name, t1.sku_name,
IF(t1.shop_price = 0, t1.sale_price, t1.shop_price) shop_price, IF(t1.shop_price = 0, t1.sale_price, t1.shop_price) shop_price,
t1.sale_price, t1.sale_price,
t1.earning_price, CAST(IF(t1.earning_price <> 0, t1.earning_price, IF(t1.shop_price <> 0 && t1.shop_price < t1.sale_price, t1.shop_price, t1.sale_price) * IF(t5.pay_percentage > 0, t5.pay_percentage, ?) / 100) AS SIGNED) earning_price,
CAST(IF(t1.earning_price <> 0, t1.earning_price, IF(t1.shop_price <> 0 && t1.shop_price < t1.sale_price, t1.shop_price, t1.sale_price) * IF(t5.pay_percentage > 0, t5.pay_percentage, ?) / 100) AS SIGNED) real_earning_price,
t1.weight, t1.weight,
t1.sku_type, t1.sku_type,
t1.promotion_type, t1.promotion_type,

2
business/model/api.go
View File

@@ -48,7 +48,7 @@ type OrderSkuExt struct {
NameID int `orm:"column(name_id)" json:"nameID"` NameID int `orm:"column(name_id)" json:"nameID"`
FullSkuName string `json:"fullSkuName"` FullSkuName string `json:"fullSkuName"`
Image string `json:"image"` Image string `json:"image"`
RealEarningPrice int64 `json:"realEarningPrice"` // 实际单品结算给门店老板钱 // RealEarningPrice int64 `json:"realEarningPrice"` // 实际单品结算给门店老板钱
} }
type GoodsOrderCountInfo struct { type GoodsOrderCountInfo struct {

12
business/model/dao/store_sku.go
View File

@@ -176,7 +176,7 @@ type StoreSkuExt struct {
EarningPrice int `json:"earningPrice"` EarningPrice int `json:"earningPrice"`
EarningActID int `orm:"column(earning_act_id)" json:"earningActID"` EarningActID int `orm:"column(earning_act_id)" json:"earningActID"`
RealEarningPrice int `json:"realEarningPrice"` // RealEarningPrice int `json:"realEarningPrice"`
StatusSaleBegin int16 `json:"statusSaleBegin"` //商品可售时间范围 StatusSaleBegin int16 `json:"statusSaleBegin"` //商品可售时间范围
StatusSaleEnd int16 `json:"statusSaleEnd"` StatusSaleEnd int16 `json:"statusSaleEnd"`
@@ -1137,12 +1137,14 @@ func UpdateActPrice4StoreSkuNameNew(db *DaoDB, storeIDs, skuIDs []int, skuNamesI
if actStoreSku := actStoreSkuMap4EarningPrice.GetActStoreSku(skuName.StoreID, v.SkuID, -1); actStoreSku != nil { if actStoreSku := actStoreSkuMap4EarningPrice.GetActStoreSku(skuName.StoreID, v.SkuID, -1); actStoreSku != nil {
v.EarningPrice = int(actStoreSku.EarningPrice) v.EarningPrice = int(actStoreSku.EarningPrice)
v.EarningActID = actStoreSku.ActID v.EarningActID = actStoreSku.ActID
} else {
v.EarningPrice = int(jxutils.CaculateSkuEarningPrice(int64(v.BindPrice), int64(v.BindPrice), skuName.PayPercentage))
} }
v.RealEarningPrice = v.EarningPrice // v.RealEarningPrice = v.EarningPrice
if v.RealEarningPrice == 0 { // if v.RealEarningPrice == 0 {
v.RealEarningPrice = int(jxutils.CaculateSkuEarningPrice(int64(v.BindPrice), int64(v.BindPrice), skuName.PayPercentage)) // v.RealEarningPrice = int(jxutils.CaculateSkuEarningPrice(int64(v.BindPrice), int64(v.BindPrice), skuName.PayPercentage))
} // }
} }
} else { } else {
skuName.UnitPrice = skuName.Price skuName.UnitPrice = skuName.Price