diff --git a/platformapi/dadaapi/order.go b/platformapi/dadaapi/order.go index 79313b9c..9c82ecac 100644 --- a/platformapi/dadaapi/order.go +++ b/platformapi/dadaapi/order.go @@ -138,7 +138,6 @@ func (a *API) QueryOrderInfo(orderID string) (order *OrderInfo, err error) { err = utils.Map2StructByJson(result.Result, &order, false) } order.DeliveryFee += (utils.Int2Float64(utils.WayBillDeliveryMarkUp) / 100) - //order.ActualFee += utils.Int2Float64(utils.WayBillDeliveryMarkUp) return order, err } diff --git a/platformapi/fnpsapi/order.go b/platformapi/fnpsapi/order.go index a2908e68..caa0cb0a 100644 --- a/platformapi/fnpsapi/order.go +++ b/platformapi/fnpsapi/order.go @@ -210,8 +210,7 @@ func (a *API) QueryOrder(partnerOrderCode string) (result *GetOrderDetailRes, er if err := json.Unmarshal([]byte(data["business_data"].(string)), &fnResult); err != nil { return nil, err } - fnResult.OrderActualAmountCent += (int64(utils.WayBillDeliveryMarkUp) * 2) - fnResult.OrderTotalAmountCent += (int64(utils.WayBillDeliveryMarkUp) * 2) + fnResult.OrderTotalAmountCent += (int64(utils.WayBillDeliveryMarkUp) * 2) // 系统加价 return fnResult, nil } diff --git a/platformapi/sfps2/order.go b/platformapi/sfps2/order.go index 8f81a5c1..a3a704f1 100644 --- a/platformapi/sfps2/order.go +++ b/platformapi/sfps2/order.go @@ -115,6 +115,7 @@ func (a *API) GetOrderStatus(sfOrderID string) (retVal *GetOrderStatusResp, err } s, _ := json.Marshal(resp.BaseRetVal.Result) if err = json.Unmarshal(s, &retVal); err == nil { + retVal.TotalPrice += utils.Int2Float64(utils.WayBillDeliveryMarkUp) globals.SugarLogger.Debugf("GetOrderStatus resp=%s", utils.Format4Output(retVal, false)) return retVal, nil } else { diff --git a/platformapi/uuptapi/waybill.go b/platformapi/uuptapi/waybill.go index 4e06a18d..886163e3 100644 --- a/platformapi/uuptapi/waybill.go +++ b/platformapi/uuptapi/waybill.go @@ -67,7 +67,7 @@ func (a *API) GetOrderDetail(orderCode string) (*GetOrderDetailResp, error) { } con := retVal != GetOrderDetailResp{} if con { - retVal.OrderPrice = utils.Float64ToStr(utils.Str2Float64(retVal.OrderPrice) + float64(utils.WayBillDeliveryMarkUp/100) + float64(0.2)) + retVal.OrderPrice = utils.Float64ToStr(utils.Str2Float64(retVal.OrderPrice) + float64(utils.WayBillDeliveryMarkUp/100)) return &retVal, nil } else { return nil, fmt.Errorf("UU跑腿未返回运单详情")