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

Merge remote-tracking branch 'origin/mark' into su

Browse Source
This commit is contained in:
苏尹岚
2020-02-21 10:26:21 +08:00
parent dd7e632105 d1c00db614
commit 1088d9c50f
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -340,6 +340,10 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.
globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku找不到门店价格（或商品映射），orderID:%s, StoreID:%d, VendorSkuID:%s, sku:%v", opNumStr, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.VendorSkuID, v) globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku找不到门店价格（或商品映射），orderID:%s, StoreID:%d, VendorSkuID:%s, sku:%v", opNumStr, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.VendorSkuID, v)
} else { } else {
v.JxSkuID = skuBindInfo.SkuID v.JxSkuID = skuBindInfo.SkuID
// TODO 客户端当前逻辑认为SkuID为0为赠品
if v.SkuID == 0 {
v.SkuID = v.JxSkuID
}
v.ShopPrice = int64(skuBindInfo.Price) v.ShopPrice = int64(skuBindInfo.Price)
v.Weight = skuBindInfo.Weight // 以本地信息中的WEIGHT为准 v.Weight = skuBindInfo.Weight // 以本地信息中的WEIGHT为准
if skuBindInfo.Price == 0 { if skuBindInfo.Price == 0 {

2
business/partner/purchase/jd/financial.go
View File

@@ -100,7 +100,7 @@ func (p *PurchaseHandler) OrderDetail2Financial(a *jdapi.API, orderData map[stri
orderFinancial.SalePriceMoney += orderSkuFinancial.SalePrice * int64(orderSkuFinancial.Count) orderFinancial.SalePriceMoney += orderSkuFinancial.SalePrice * int64(orderSkuFinancial.Count)
orderSkuFinancial.SkuID = int(utils.Str2Int64WithDefault(utils.Interface2String(xMap["skuIdIsv"]), 0)) orderSkuFinancial.SkuID = int(utils.Str2Int64WithDefault(utils.Interface2String(xMap["skuIdIsv"]), 0))
if orderSkuFinancial.SkuID > math.MaxInt32 { if orderSkuFinancial.SkuID > math.MaxInt32 {
orderSkuFinancial.SkuID = 0 orderSkuFinancial.SkuID = orderSkuFinancial.JxSkuID
} }
orderFinancial.Skus = append(orderFinancial.Skus, orderSkuFinancial) orderFinancial.Skus = append(orderFinancial.Skus, orderSkuFinancial)
} }