Merge branch 'lcw' of https://git.dev.tencent.com/XJH-Rosy/jx-callback into lcw

business/partner/purchase/jd/financial.go

@@ -99,6 +99,7 @@ func (p *PurchaseHandler) OrderDetail2Financial(orderData map[string]interface{}
 		// 如果为自配送，自配送补贴=订单初始运费，远距离费=0
 		orderFinancial.SelfDeliveryDiscountMoney = utils.MustInterface2Int64(orderData["orderReceivableFreight"])
 		orderFinancial.DistanceFreightMoney = 0
+		orderFinancial.FreightTipsMoney = 0
 		// 通过本地数据库去取是否转美团/达达，并计算运费
 		// wayBill, err2 := partner.CurOrderManager.LoadWaybill(orderFinancial.VendorOrderID, orderFinancial.VendorID)
 		// if err = err2; err == nil {
@@ -127,11 +128,12 @@ func (p *PurchaseHandler) OrderDetail2Financial(orderData map[string]interface{}
 			if xMap["orderShareRatioData"] != nil {
 				orderShareRatioData, _ := utils.HTTPBody2Values([]byte(utils.Interface2String(xMap["orderShareRatioData"])), false)
 				activity := &model.OrderDiscountFinancial{
-					VendorID:      orderFinancial.VendorID,
-					VendorOrderID: orderFinancial.VendorOrderID,
+					VendorID:         orderFinancial.VendorID,
+					VendorOrderID:    orderFinancial.VendorOrderID,
+					VendorActivityID: utils.Interface2String(orderShareRatioData["promotionId"][0]),
+					Type:             utils.Int64ToStr(int64(discountType)),
 					// ActivityName:     utils.Interface2String(xMap["discountName"]),
 					// ActivityMoney:    discountPrice,
-					VendorActivityID: utils.Interface2String(orderShareRatioData["promotionId"][0]),
 					// Remark:           utils.Interface2String(xMap["orderShareRatioData"]),
 				}
 				orderFinancial.Discounts = append(orderFinancial.Discounts, activity)