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

斤斤计较回退

Browse Source
This commit is contained in:
suyl
2020-05-06 19:58:01 +08:00
parent 3e22113d2c
commit e1959f5d7f
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,28 +365,28 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.
}
v.EarningPrice = jxutils.CaculateSkuEarningPrice(v.ShopPrice, salePrice, storePayPercentage)
//TODO 重复购买有结算价的商品需要拆分，第一个商品按结算价，后面的商品按shopprice 或者 saleprice, 2020-05-06
if v.Count > 1 {
storeID := 0
if order.StoreID == 0 {
storeID = order.JxStoreID
} else {
storeID = order.StoreID
}
result, _ := dao.GetEffectiveActStoreSkuInfo(db, 0, nil, 0, []int{storeID}, []int{v.SkuID}, order.OrderCreatedAt, order.OrderCreatedAt)
if len(result) > 0 {
if result[0].EarningPrice != 0 {
sku := v
sku.Count = v.Count - 1
v.Count = 1
if v.ShopPrice < v.SalePrice {
sku.EarningPrice = v.ShopPrice
} else {
sku.EarningPrice = v.SalePrice
}
orderSkus = append(orderSkus, sku)
}
}
}
// if v.Count > 1 {
// storeID := 0
// if order.StoreID == 0 {
// storeID = order.JxStoreID
// } else {
// storeID = order.StoreID
// }
// result, _ := dao.GetEffectiveActStoreSkuInfo(db, 0, nil, 0, []int{storeID}, []int{v.SkuID}, order.OrderCreatedAt, order.OrderCreatedAt)
// if len(result) > 0 {
// if result[0].EarningPrice != 0 {
// sku := v
// sku.Count = v.Count - 1
// v.Count = 1
// if v.ShopPrice < v.SalePrice {
// sku.EarningPrice = v.ShopPrice
// } else {
// sku.EarningPrice = v.SalePrice
// }
// orderSkus = append(orderSkus, sku)
// }
// }
// }
}
// 直营店始终按比例结算，不考虑活动与结算表
if changePriceType != model.StoreChangePriceTypeManagedStore {