liulei/baseapi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2023-06-07 11:20:05 +08:00
parent 96235fd440
commit b2807b98b2
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platformapi/dadaapi/order.go
View File

@@ -138,7 +138,6 @@ func (a *API) QueryOrderInfo(orderID string) (order *OrderInfo, err error) {
err = utils.Map2StructByJson(result.Result, &order, false) err = utils.Map2StructByJson(result.Result, &order, false)
} }
order.DeliveryFee += (utils.Int2Float64(utils.WayBillDeliveryMarkUp) / 100) order.DeliveryFee += (utils.Int2Float64(utils.WayBillDeliveryMarkUp) / 100)
//order.ActualFee += utils.Int2Float64(utils.WayBillDeliveryMarkUp)
return order, err return order, err
} }

3
platformapi/fnpsapi/order.go
View File

@@ -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 { if err := json.Unmarshal([]byte(data["business_data"].(string)), &fnResult); err != nil {
return nil, err return nil, err
} }
fnResult.OrderActualAmountCent += (int64(utils.WayBillDeliveryMarkUp) * 2) fnResult.OrderTotalAmountCent += (int64(utils.WayBillDeliveryMarkUp) * 2) // 系统加价
fnResult.OrderTotalAmountCent += (int64(utils.WayBillDeliveryMarkUp) * 2)
return fnResult, nil return fnResult, nil
} }

1
platformapi/sfps2/order.go
View File

@@ -115,6 +115,7 @@ func (a *API) GetOrderStatus(sfOrderID string) (retVal *GetOrderStatusResp, err
} }
s, _ := json.Marshal(resp.BaseRetVal.Result) s, _ := json.Marshal(resp.BaseRetVal.Result)
if err = json.Unmarshal(s, &retVal); err == nil { if err = json.Unmarshal(s, &retVal); err == nil {
retVal.TotalPrice += utils.Int2Float64(utils.WayBillDeliveryMarkUp)
globals.SugarLogger.Debugf("GetOrderStatus resp=%s", utils.Format4Output(retVal, false)) globals.SugarLogger.Debugf("GetOrderStatus resp=%s", utils.Format4Output(retVal, false))
return retVal, nil return retVal, nil
} else { } else {

2
platformapi/uuptapi/waybill.go
View File

@@ -67,7 +67,7 @@ func (a *API) GetOrderDetail(orderCode string) (*GetOrderDetailResp, error) {
} }
con := retVal != GetOrderDetailResp{} con := retVal != GetOrderDetailResp{}
if con { 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 return &retVal, nil
} else { } else {
return nil, fmt.Errorf("UU跑腿未返回运单详情") return nil, fmt.Errorf("UU跑腿未返回运单详情")