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))