From 1bb6e382027d43fbfb425cbe0952008e123041c7 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 29 Apr 2019 15:57:09 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E5=A4=84=E7=90=86=E4=BA=AC=E4=B8=9CorderSh?=
 =?UTF-8?q?areRatioData?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jd/financial.go | 24 ++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/business/partner/purchase/jd/financial.go b/business/partner/purchase/jd/financial.go
index 1c4fef6ba..041b37aa2 100644
--- a/business/partner/purchase/jd/financial.go
+++ b/business/partner/purchase/jd/financial.go
@@ -127,18 +127,20 @@ func (p *PurchaseHandler) OrderDetail2Financial(orderData map[string]interface{}
 			orderFinancial.TotalDiscountMoney += discountPrice
 			if xMap["orderShareRatioData"] != nil {
 				orderShareRatioData, _ := utils.HTTPBody2Values([]byte(utils.Interface2String(xMap["orderShareRatioData"])), false)
-				activity := &model.OrderDiscountFinancial{
-					VendorID:         orderFinancial.VendorID,
-					VendorOrderID:    orderFinancial.VendorOrderID,
-					VendorActivityID: utils.Interface2String(orderShareRatioData["promotionId"][0]),
-					Type:             utils.Int64ToStr(int64(discountType)),
-					// ActivityName:     utils.Interface2String(xMap["discountName"]),
-					// ActivityMoney:    discountPrice,
-					// Remark:           utils.Interface2String(xMap["orderShareRatioData"]),
+				if promotionID := orderShareRatioData.Get("promotionId"); promotionID != "" {
+					activity := &model.OrderDiscountFinancial{
+						VendorID:         orderFinancial.VendorID,
+						VendorOrderID:    orderFinancial.VendorOrderID,
+						VendorActivityID: promotionID, // utils.Interface2String(orderShareRatioData["promotionId"][0]),
+						Type:             utils.Int64ToStr(int64(discountType)),
+						// ActivityName:     utils.Interface2String(xMap["discountName"]),
+						// ActivityMoney:    discountPrice,
+						// Remark:           utils.Interface2String(xMap["orderShareRatioData"]),
+					}
+					orderFinancial.Discounts = append(orderFinancial.Discounts, activity)
+					// 通过活动Id去取，京西活动补贴
+					// orderFinancial.JxSubsidyMoney +=
 				}
-				orderFinancial.Discounts = append(orderFinancial.Discounts, activity)
-				// 通过活动Id去取，京西活动补贴
-				// orderFinancial.JxSubsidyMoney +=
 			}
 		}
 		globals.SugarLogger.Debug(utils.Format4Output(orderFinancial.Discounts, false))