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

- fk

Browse Source
This commit is contained in:
gazebo
2019-06-12 09:52:39 +08:00
parent 3fb6bba882
commit 13a384248b
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,7 +221,7 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao
shop_price, vendor_price, sale_price, weight, sku_type, promotion_type, order_created_at) VALUES` shop_price, vendor_price, sale_price, weight, sku_type, promotion_type, order_created_at) VALUES`
params := []interface{}{} params := []interface{}{}
for _, sku := range order.Skus { for _, sku := range order.Skus {
sql += "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)," sql += "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?),"
// 有时不是通过京西平台建立的SKU，不范围要超过 // 有时不是通过京西平台建立的SKU，不范围要超过
skuID := 0 skuID := 0
if sku.SkuID < math.MaxInt32 { if sku.SkuID < math.MaxInt32 {

6
business/partner/purchase/ebai/order.go
View File

@@ -239,7 +239,11 @@ func getSkuSalePrice2(product *ebaiapi.OrderProductInfo) (salePrice int) {
if product.ProductSubsidy != nil { if product.ProductSubsidy != nil {
for _, v := range product.ProductSubsidy.DiscountDetail { for _, v := range product.ProductSubsidy.DiscountDetail {
if skuActTypeMap[v.Type] == 1 { if skuActTypeMap[v.Type] == 1 {
salePrice -= (v.BaiduRate + v.ShopRate) / product.Number // 饿百同一SKU的优惠与非优惠没有拆开，平均摊销处理 skuCount := product.ProductAmount
if skuCount == 0 {
skuCount = product.Number
}
salePrice -= (v.BaiduRate + v.ShopRate) / skuCount // 饿百同一SKU的优惠与非优惠没有拆开，平均摊销处理
} }
} }
} }

2
business/partner/purchase/mtwm/store_sku.go
View File

@@ -357,7 +357,7 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks
_, err = dao.UpdateEntity(db, storeSkuBind, updateFields...) _, err = dao.UpdateEntity(db, storeSkuBind, updateFields...)
} }
} else if isErrModifyPrice(err) { } else if isErrModifyPrice(err) {
err = partner.NewErrorCode(err.Error(), partner.ErrCodeChangePriceFailed, model.VendorIDEBAI) err = partner.NewErrorCode(err.Error(), partner.ErrCodeChangePriceFailed, model.VendorIDMTWM)
} }
return nil, err return nil, err
}, skus) }, skus)