1
This commit is contained in:
@@ -198,11 +198,8 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo
|
|||||||
deliveryFeeInfo = &partner.WaybillFeeInfo{}
|
deliveryFeeInfo = &partner.WaybillFeeInfo{}
|
||||||
price, err := api.SfPsAPI.PreCreateOrder(param)
|
price, err := api.SfPsAPI.PreCreateOrder(param)
|
||||||
//+0.2
|
//+0.2
|
||||||
deliveryFee := utils.Float64TwoInt(price) + utils.WayBillDeliveryMarkUp
|
//deliveryFee := utils.Float64TwoInt(price) + utils.WayBillDeliveryMarkUp
|
||||||
globals.SugarLogger.Debugf("GetWaybillFee utils.Float64TwoInt(price)=%d", utils.Float64TwoInt(price))
|
deliveryFeeInfo.DeliveryFee = utils.Float64TwoInt64(price)
|
||||||
globals.SugarLogger.Debugf("GetWaybillFee utils.WayBillDeliveryMarkUp=%d", utils.WayBillDeliveryMarkUp)
|
|
||||||
globals.SugarLogger.Debugf("GetWaybillFee deliveryFee=%d", deliveryFee)
|
|
||||||
deliveryFeeInfo.DeliveryFee = int64(deliveryFee)
|
|
||||||
globals.SugarLogger.Debugf("GetWaybillFee deliveryFeeInfo.DeliveryFee=%d", deliveryFeeInfo.DeliveryFee)
|
globals.SugarLogger.Debugf("GetWaybillFee deliveryFeeInfo.DeliveryFee=%d", deliveryFeeInfo.DeliveryFee)
|
||||||
return deliveryFeeInfo, err
|
return deliveryFeeInfo, err
|
||||||
}
|
}
|
||||||
@@ -304,6 +301,7 @@ func OnWaybillMsg(urlIndex string, msg interface{}) (resp *sfps2.CallbackRespons
|
|||||||
//+0.2
|
//+0.2
|
||||||
sfTotalPrice := utils.Float64TwoInt(sfOrder.TotalPrice) + utils.WayBillDeliveryMarkUp
|
sfTotalPrice := utils.Float64TwoInt(sfOrder.TotalPrice) + utils.WayBillDeliveryMarkUp
|
||||||
sfActualPrice := utils.Float64TwoInt64(sfOrder.RealPayMoney)
|
sfActualPrice := utils.Float64TwoInt64(sfOrder.RealPayMoney)
|
||||||
|
globals.SugarLogger.Debugf("SFPS OnWaybillMsg,sfTotalPrice=%d,sfActualPrice=%d", sfTotalPrice, sfActualPrice)
|
||||||
|
|
||||||
var good *model.GoodsOrder
|
var good *model.GoodsOrder
|
||||||
sql := `SELECT * FROM goods_order WHERE vendor_order_id = ? ORDER BY order_created_at DESC LIMIT 1 OFFSET 0`
|
sql := `SELECT * FROM goods_order WHERE vendor_order_id = ? ORDER BY order_created_at DESC LIMIT 1 OFFSET 0`
|
||||||
|
|||||||
Reference in New Issue
Block a user