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-05-18 09:02:34 +08:00
parent 2d798aab89
commit 60274cc5e6
4 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platformapi/dadaapi/order.go
View File

@@ -136,8 +136,8 @@ func (a *API) QueryOrderInfo(orderID string) (order *OrderInfo, err error) {
if err == nil { if err == nil {
err = utils.Map2StructByJson(result.Result, &order, false) err = utils.Map2StructByJson(result.Result, &order, false)
} }
order.DeductFee += utils.Int2Float64(utils.WayBillDeliveryMarkUp) order.DeliveryFee += utils.Int2Float64(utils.WayBillDeliveryMarkUp)
order.ActualFee += utils.Int2Float64(utils.WayBillDeliveryMarkUp) //order.ActualFee += utils.Int2Float64(utils.WayBillDeliveryMarkUp)
return order, err return order, err
} }

14
platformapi/dadaapi/order_test.go
View File

@@ -2,9 +2,9 @@ package dadaapi
// //
import ( import (
"fmt"
//"fmt" //"fmt"
"testing" "testing"
//"git.rosy.net.cn/baseapi" //"git.rosy.net.cn/baseapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
) )
@@ -75,10 +75,8 @@ func TestQueryOrderInfo(t *testing.T) {
t.Log(utils.Format4Output(result, false)) t.Log(utils.Format4Output(result, false))
} }
// func TestAddTip(t *testing.T) {
//func TestAddTip(t *testing.T) { payload := map[string]interface{}{"categoryID": 3095}
// err := dadaapi.AddTip("80704840263399812", 1.0, "530100", "") fmt.Println(payload["img"] != nil)
// if err != nil { fmt.Println(payload["img"] != "")
// t.Fatal(err) }
// }
//}

2
platformapi/fnpsapi/order.go
View File

@@ -60,7 +60,7 @@ func (a *API) PreCreateByShopFn(basicParams *PreCreateOrder) (deliveryFee, baseD
if v.IsValid != 1 { if v.IsValid != 1 {
continue continue
} }
deliveryFeeFn = v.ActualDeliveryAmountCent // 优惠后 deliveryFeeFn = v.TotalDeliveryAmountCent // 优惠后 actual_delivery_amount_cent
baseDeliveryFeeFn = v.TotalDeliveryAmountCent // 原始配送费 baseDeliveryFeeFn = v.TotalDeliveryAmountCent // 原始配送费
} }

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.MtPeisongID = result.Data["mt_peisong_id"].(string)
order.DeliveryID = utils.MustInterface2Int64(result.Data["delivery_id"]) order.DeliveryID = utils.MustInterface2Int64(result.Data["delivery_id"])
order.OrderID = result.Data["order_id"].(string) 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 return order
} }
@@ -347,7 +347,7 @@ func (a *API) QueryOrderStatus(deliveryId int64, mtPeiSongId string) (retVal map
return nil, err return nil, err
} }
result.Data["delivery_fee"] = utils.MustInterface2Float64(result.Data["delivery_fee"]) + utils.MustInterface2Float64(utils.WayBillDeliveryMarkUp) result.Data["delivery_fee"] = utils.MustInterface2Float64(result.Data["delivery_fee"]) + utils.MustInterface2Float64(utils.WayBillDeliveryMarkUp)
result.Data["pay_amount"] = utils.MustInterface2Float64(result.Data["pay_amount"]) + utils.MustInterface2Float64(utils.WayBillDeliveryMarkUp) result.Data["pay_amount"] = utils.MustInterface2Float64(result.Data["pay_amount"])
return result.Data, nil return result.Data, nil
} }
@@ -467,8 +467,9 @@ func (a *API) PreCreateByShop(basicParams *PreCreateByShopParam) (deliveryFee, b
return 0, 0, err return 0, 0, err
} }
deliveryFee = utils.Float64TwoInt64(utils.MustInterface2Float64(result.Data["delivery_fee"]) * 100) // 订单配送价格 deliveryFee = utils.Float64TwoInt64(utils.MustInterface2Float64(result.Data["delivery_fee"]) * 100) // 订单配送价格
baseDeliveryFee = utils.Float64TwoInt64(utils.MustInterface2Float64(result.Data["base_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 return deliveryFee, baseDeliveryFee, nil
} }