From 60274cc5e6b0fe451f4804bac5e2735eea7e8363 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Thu, 18 May 2023 09:02:34 +0800
Subject: [PATCH] 1

---
 platformapi/dadaapi/order.go      |  4 ++--
 platformapi/dadaapi/order_test.go | 14 ++++++--------
 platformapi/fnpsapi/order.go      |  2 +-
 platformapi/mtpsapi/mtpsapi.go    |  9 +++++----
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/platformapi/dadaapi/order.go b/platformapi/dadaapi/order.go
index ead6b35f..00d432d1 100644
--- a/platformapi/dadaapi/order.go
+++ b/platformapi/dadaapi/order.go
@@ -136,8 +136,8 @@ func (a *API) QueryOrderInfo(orderID string) (order *OrderInfo, err error) {
 	if err == nil {
 		err = utils.Map2StructByJson(result.Result, &order, false)
 	}
-	order.DeductFee += utils.Int2Float64(utils.WayBillDeliveryMarkUp)
-	order.ActualFee += utils.Int2Float64(utils.WayBillDeliveryMarkUp)
+	order.DeliveryFee += utils.Int2Float64(utils.WayBillDeliveryMarkUp)
+	//order.ActualFee += utils.Int2Float64(utils.WayBillDeliveryMarkUp)
 	return order, err
 }
 
diff --git a/platformapi/dadaapi/order_test.go b/platformapi/dadaapi/order_test.go
index bcab2cbe..7b841a94 100644
--- a/platformapi/dadaapi/order_test.go
+++ b/platformapi/dadaapi/order_test.go
@@ -2,9 +2,9 @@ package dadaapi
 
 //
 import (
+	"fmt"
 	//"fmt"
 	"testing"
-
 	//"git.rosy.net.cn/baseapi"
 	"git.rosy.net.cn/baseapi/utils"
 )
@@ -75,10 +75,8 @@ func TestQueryOrderInfo(t *testing.T) {
 	t.Log(utils.Format4Output(result, false))
 }
 
-//
-//func TestAddTip(t *testing.T) {
-//	err := dadaapi.AddTip("80704840263399812", 1.0, "530100", "")
-//	if err != nil {
-//		t.Fatal(err)
-//	}
-//}
+func TestAddTip(t *testing.T) {
+	payload := map[string]interface{}{"categoryID": 3095}
+	fmt.Println(payload["img"] != nil)
+	fmt.Println(payload["img"] != "")
+}
diff --git a/platformapi/fnpsapi/order.go b/platformapi/fnpsapi/order.go
index 3b5ee76d..4c560736 100644
--- a/platformapi/fnpsapi/order.go
+++ b/platformapi/fnpsapi/order.go
@@ -60,7 +60,7 @@ func (a *API) PreCreateByShopFn(basicParams *PreCreateOrder) (deliveryFee, baseD
 		if v.IsValid != 1 {
 			continue
 		}
-		deliveryFeeFn = v.ActualDeliveryAmountCent    // 优惠后
+		deliveryFeeFn = v.TotalDeliveryAmountCent     // 优惠后 actual_delivery_amount_cent
 		baseDeliveryFeeFn = v.TotalDeliveryAmountCent // 原始配送费
 	}
 
diff --git a/platformapi/mtpsapi/mtpsapi.go b/platformapi/mtpsapi/mtpsapi.go
index 267f0e90..cc2303ae 100644
--- a/platformapi/mtpsapi/mtpsapi.go
+++ b/platformapi/mtpsapi/mtpsapi.go
@@ -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
 }
 
@@ -347,7 +347,7 @@ func (a *API) QueryOrderStatus(deliveryId int64, mtPeiSongId string) (retVal map
 		return nil, err
 	}
 	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
 }
 
@@ -467,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
 }