From 7975ae96f0247ab084566932a4682403ebcc4d97 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Thu, 29 Apr 2021 17:36:37 +0800
Subject: [PATCH] aa

---
 platformapi/mtunionapi/mtunionapi_test.go     |  4 +-
 platformapi/pddapi/order.go                   | 40 +++++++++++++++++++
 platformapi/pddapi/order_test.go              | 22 ++++++++++
 platformapi/tonglianpayapi/callback.go        |  8 ++--
 .../tonglianpayapi/tonglianpayapi_test.go     |  2 +-
 5 files changed, 70 insertions(+), 6 deletions(-)
 create mode 100644 platformapi/pddapi/order.go
 create mode 100644 platformapi/pddapi/order_test.go

diff --git a/platformapi/mtunionapi/mtunionapi_test.go b/platformapi/mtunionapi/mtunionapi_test.go
index 31b31ce3..4c0b3ba6 100644
--- a/platformapi/mtunionapi/mtunionapi_test.go
+++ b/platformapi/mtunionapi/mtunionapi_test.go
@@ -28,7 +28,7 @@ func init() {
 }
 
 func TestMiniCode(t *testing.T) {
-	result, err := api.MiniCode(4, strings.ToLower("12521"))
+	result, err := api.MiniCode(2, strings.ToLower("9999999999999"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -36,7 +36,7 @@ func TestMiniCode(t *testing.T) {
 }
 
 func TestGenerateLink(t *testing.T) {
-	result, err := api.GenerateLink(2, 2, strings.ToLower("9999999999999"))
+	result, err := api.GenerateLink(2, 4, strings.ToLower("efa9876238fc11eb9101525400c36bda903"))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/platformapi/pddapi/order.go b/platformapi/pddapi/order.go
new file mode 100644
index 00000000..24a018ec
--- /dev/null
+++ b/platformapi/pddapi/order.go
@@ -0,0 +1,40 @@
+package pddapi
+
+import "git.rosy.net.cn/baseapi/utils"
+
+//查询订单列表
+func (a *API) OrderListRangeGet(beginTime, endTime, lastOrderID string, pageSize int) (bool bool, err error) {
+	params := map[string]interface{}{
+		"start_time": beginTime,
+		"end_time":   endTime,
+		"page_size":  pageSize,
+	}
+	if lastOrderID != "" {
+		params["last_order_id"] = lastOrderID
+	}
+	result, err := a.AccessAPI("pdd.ddk.order.list.range.get", false, params)
+	if err == nil {
+		if utils.MustInterface2Int64(result["order_list_get_response"].(map[string]interface{})["order_list"]) == 0 {
+			return false, err
+		} else {
+			return true, err
+		}
+	}
+	return false, err
+}
+
+//查询订单详情
+func (a *API) OrderDetailGet(orderID string) (bool bool, err error) {
+	params := map[string]interface{}{
+		"order_sn": orderID,
+	}
+	result, err := a.AccessAPI("pdd.ddk.order.detail.get", false, params)
+	if err == nil {
+		if utils.MustInterface2Int64(result["order_list_get_response"].(map[string]interface{})["order_list"]) == 0 {
+			return false, err
+		} else {
+			return true, err
+		}
+	}
+	return false, err
+}
diff --git a/platformapi/pddapi/order_test.go b/platformapi/pddapi/order_test.go
new file mode 100644
index 00000000..4f825910
--- /dev/null
+++ b/platformapi/pddapi/order_test.go
@@ -0,0 +1,22 @@
+package pddapi
+
+import (
+	"git.rosy.net.cn/baseapi/utils"
+	"testing"
+)
+
+func TestOrderListRangeGet(t *testing.T) {
+	result, err := api.OrderListRangeGet("2021-04-28 00:00:00", "2021-04-29:23:59:59", "", 100)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(utils.Format4Output(result, false))
+}
+
+func TestOrderDetailGet(t *testing.T) {
+	result, err := api.OrderDetailGet("")
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(utils.Format4Output(result, false))
+}
diff --git a/platformapi/tonglianpayapi/callback.go b/platformapi/tonglianpayapi/callback.go
index 60e4011d..7f19b46b 100644
--- a/platformapi/tonglianpayapi/callback.go
+++ b/platformapi/tonglianpayapi/callback.go
@@ -8,9 +8,11 @@ import (
 )
 
 const (
-	MsgTypeUnkown = 0        // 未知
-	MsgTypePay    = "VSP501" // 支付结果回调
-	MsgTypeRefund = "VSP503" // 退款结果回调
+	MsgTypeUnkown    = 0        // 未知
+	MsgTypePay       = "VSP501" // 支付结果回调 （微信
+	MsgTypeRefund    = "VSP503" // 退款结果回调 （微信
+	MsgTypePayZFB    = "VSP511" //支付宝
+	MsgTypeRefundZFB = "VSP513"
 
 	TrxStatusSuccess = "0000"
 )
diff --git a/platformapi/tonglianpayapi/tonglianpayapi_test.go b/platformapi/tonglianpayapi/tonglianpayapi_test.go
index d503026d..bb74b0a1 100644
--- a/platformapi/tonglianpayapi/tonglianpayapi_test.go
+++ b/platformapi/tonglianpayapi/tonglianpayapi_test.go
@@ -18,7 +18,7 @@ func init() {
 	sugarLogger = logger.Sugar()
 	baseapi.Init(sugarLogger)
 
-	api = New("00183083", "18048531223", "56065105499TVAH", "wx4b5930c13f8b1170")
+	api = New("00183083", "18048531223", "56065105499TVAH")
 }
 
 func TestCreateUnitorderOrder(t *testing.T) {