From 11cfe97b3d146ae77f280af92c90b35f53aa8331 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 30 May 2023 10:46:18 +0800 Subject: [PATCH] 1 --- business/partner/delivery/sfps/waybill.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go index 2e2a76b10..ab98fc62e 100644 --- a/business/partner/delivery/sfps/waybill.go +++ b/business/partner/delivery/sfps/waybill.go @@ -198,11 +198,8 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo deliveryFeeInfo = &partner.WaybillFeeInfo{} price, err := api.SfPsAPI.PreCreateOrder(param) //+0.2 - deliveryFee := utils.Float64TwoInt(price) + utils.WayBillDeliveryMarkUp - globals.SugarLogger.Debugf("GetWaybillFee utils.Float64TwoInt(price)=%d", utils.Float64TwoInt(price)) - globals.SugarLogger.Debugf("GetWaybillFee utils.WayBillDeliveryMarkUp=%d", utils.WayBillDeliveryMarkUp) - globals.SugarLogger.Debugf("GetWaybillFee deliveryFee=%d", deliveryFee) - deliveryFeeInfo.DeliveryFee = int64(deliveryFee) + //deliveryFee := utils.Float64TwoInt(price) + utils.WayBillDeliveryMarkUp + deliveryFeeInfo.DeliveryFee = utils.Float64TwoInt64(price) globals.SugarLogger.Debugf("GetWaybillFee deliveryFeeInfo.DeliveryFee=%d", deliveryFeeInfo.DeliveryFee) return deliveryFeeInfo, err } @@ -304,6 +301,7 @@ func OnWaybillMsg(urlIndex string, msg interface{}) (resp *sfps2.CallbackRespons //+0.2 sfTotalPrice := utils.Float64TwoInt(sfOrder.TotalPrice) + utils.WayBillDeliveryMarkUp sfActualPrice := utils.Float64TwoInt64(sfOrder.RealPayMoney) + globals.SugarLogger.Debugf("SFPS OnWaybillMsg,sfTotalPrice=%d,sfActualPrice=%d", sfTotalPrice, sfActualPrice) var good *model.GoodsOrder sql := `SELECT * FROM goods_order WHERE vendor_order_id = ? ORDER BY order_created_at DESC LIMIT 1 OFFSET 0`