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

Merge branch 'master' of https://e.coding.net/rosydev/baseapi

Browse Source
This commit is contained in:
richboo111
2023-05-23 09:39:04 +08:00
parent e17074366b 2297a5cc46
commit 11fc0151aa
19 changed files with 166 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platformapi/mtpsapi/mtpsapi.go
View File

@@ -295,7 +295,7 @@ func (a *API) result2OrderResponse(result *ResponseResult) (order *OrderResponse
order.MtPeisongID = result.Data["mt_peisong_id"].(string)
order.DeliveryID = utils.MustInterface2Int64(result.Data["delivery_id"])
order.OrderID = result.Data["order_id"].(string)
order.DeliveryFee = utils.MustInterface2Float64(result.Data["delivery_fee"])
order.DeliveryFee = utils.MustInterface2Float64(result.Data["delivery_fee"]) // 原价
return order
}
@@ -346,6 +346,8 @@ func (a *API) QueryOrderStatus(deliveryId int64, mtPeiSongId string) (retVal map
if err != nil {
return nil, err
}
result.Data["delivery_fee"] = utils.MustInterface2Float64(result.Data["delivery_fee"]) + (float64(utils.WayBillDeliveryMarkUp) / 100)
result.Data["pay_amount"] = utils.MustInterface2Float64(result.Data["pay_amount"])
return result.Data, nil
}
@@ -465,8 +467,9 @@ func (a *API) PreCreateByShop(basicParams *PreCreateByShopParam) (deliveryFee, b
return 0, 0, err
}
deliveryFee = utils.Float64TwoInt64(utils.MustInterface2Float64(result.Data["delivery_fee"]) * 100) // 订单配送价格
baseDeliveryFee = utils.Float64TwoInt64(utils.MustInterface2Float64(result.Data["base_delivery_fee"]) * 100) // 订单优惠价格
deliveryFee = utils.Float64TwoInt64(utils.MustInterface2Float64(result.Data["delivery_fee"]) * 100) // 订单配送价格
baseDeliveryFee = utils.Float64TwoInt64(utils.MustInterface2Float64(result.Data["delivery_fee"]) * 100) // 订单优惠价格
//baseDeliveryFee = utils.Float64TwoInt64(utils.MustInterface2Float64(result.Data["base_delivery_fee"]) * 100) // 订单优惠价格
return deliveryFee, baseDeliveryFee, nil
}