From aafc7655e568fef81e7b5c77d93176607a8afa51 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 21 Feb 2020 09:54:19 +0800 Subject: [PATCH] =?UTF-8?q?SkuID=E4=B8=BA0=E6=97=B6=EF=BC=8C=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=BAJxSkuID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/order.go | 4 ++++ business/partner/purchase/jd/financial.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 82326ba96..6e6a51564 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -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) } else { v.JxSkuID = skuBindInfo.SkuID + // TODO 客户端当前逻辑认为SkuID为0为赠品 + if v.SkuID == 0 { + v.SkuID = v.JxSkuID + } v.ShopPrice = int64(skuBindInfo.Price) v.Weight = skuBindInfo.Weight // 以本地信息中的WEIGHT为准 if skuBindInfo.Price == 0 { diff --git a/business/partner/purchase/jd/financial.go b/business/partner/purchase/jd/financial.go index 30abad981..814b750e4 100644 --- a/business/partner/purchase/jd/financial.go +++ b/business/partner/purchase/jd/financial.go @@ -100,7 +100,7 @@ func (p *PurchaseHandler) OrderDetail2Financial(a *jdapi.API, orderData map[stri orderFinancial.SalePriceMoney += orderSkuFinancial.SalePrice * int64(orderSkuFinancial.Count) orderSkuFinancial.SkuID = int(utils.Str2Int64WithDefault(utils.Interface2String(xMap["skuIdIsv"]), 0)) if orderSkuFinancial.SkuID > math.MaxInt32 { - orderSkuFinancial.SkuID = 0 + orderSkuFinancial.SkuID = orderSkuFinancial.JxSkuID } orderFinancial.Skus = append(orderFinancial.Skus, orderSkuFinancial) }