From 14611a30b9006896f97ad804eae6858a51e435fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= <gc@dtapp.net>
Date: Sat, 25 Dec 2021 16:28:59 +0800
Subject: [PATCH] update

---
 .github/workflows/go.yml                   |  1 -
 service/dingdanxia/app_test.go             | 23 ----------------
 service/dingdanxia/jd.jy_order_details.go  | 32 ++++++++++++++++++++++
 service/dingdanxia/jd.jy_order_details2.go |  1 +
 utils/url/url_test.go                      |  8 ++----
 5 files changed, 36 insertions(+), 29 deletions(-)
 delete mode 100644 service/dingdanxia/app_test.go
 create mode 100644 service/dingdanxia/jd.jy_order_details.go
 create mode 100644 service/dingdanxia/jd.jy_order_details2.go

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 6c493d47..02088304 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -7,7 +7,6 @@ on:
     branches: [ master ]
 
 jobs:
-
   build:
     runs-on: ubuntu-latest
     steps:
diff --git a/service/dingdanxia/app_test.go b/service/dingdanxia/app_test.go
deleted file mode 100644
index 80819564..00000000
--- a/service/dingdanxia/app_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package dingdanxia
-
-import (
-	"log"
-	"testing"
-
-	"github.com/dtapps/go-library/utils/gotime"
-)
-
-var app = App{
-	ApiKey: "ZTe5tqKhIc6nm8HkJkqj5hmpmAjs1WTy",
-}
-
-func TestApp(t *testing.T) {
-	param := NewParams()
-	param.Set("start_time", gotime.Current().BeforeDay(28).Timestamp())
-	param.Set("end_time", gotime.Current().Timestamp())
-	res, err := app.WaimaiMeituanOrders(param)
-	log.Println(res)
-	log.Printf("%s\n", res)
-	log.Printf("%v\n", res)
-	log.Println(err)
-}
diff --git a/service/dingdanxia/jd.jy_order_details.go b/service/dingdanxia/jd.jy_order_details.go
new file mode 100644
index 00000000..a09cbf24
--- /dev/null
+++ b/service/dingdanxia/jd.jy_order_details.go
@@ -0,0 +1,32 @@
+package dingdanxia
+
+import "net/http"
+
+type JdJyOrderDetailsResult struct {
+	Code         int    `json:"code"`
+	Msg          string `json:"msg"`           // 描述
+	TotalResults int    `json:"total_results"` // 总条数
+	Data         []struct {
+		Orderid     string `json:"orderid"`      // 订单ID
+		Paytime     string `json:"paytime"`      // 订单支付时间
+		Payprice    string `json:"payprice"`     // 订单支付金额
+		Profit      string `json:"profit"`       // 订单返佣金额
+		Smstitle    string `json:"smstitle"`     // 订单标题
+		Sid         string `json:"sid"`          // 渠道方用户唯一标识
+		Quantity    string `json:"quantity"`     // 退款笔数
+		Refundtime  string `json:"refundtime"`   // 退款时间
+		Money       string `json:"money"`        // 退款金额
+		RefundMoney string `json:"refund_money"` // 退佣金额
+		CreateTime  string `json:"create_time"`  // 数据入库更新时间（订单状态改变，该时间会变）
+		Status      int    `json:"status"`       // 订单状态(1-已提交（已付款）、8-已完成（确认收货）、9-已退款)
+		Type        int    `json:"type"`         // 订单类型（活动名称）4-外卖 6-闪购 8-优选 2-酒店
+	} `json:"data"`
+}
+
+func (app *App) JdJyOrderDetails(notMustParams ...Params) (body []byte, err error) {
+	// 参数
+	params := app.NewParamsWith(notMustParams...)
+	// 请求
+	body, err = app.request("https://api.tbk.dingdanxia.com/jd/jy_order_details", params, http.MethodPost)
+	return body, err
+}
diff --git a/service/dingdanxia/jd.jy_order_details2.go b/service/dingdanxia/jd.jy_order_details2.go
new file mode 100644
index 00000000..95addefa
--- /dev/null
+++ b/service/dingdanxia/jd.jy_order_details2.go
@@ -0,0 +1 @@
+package dingdanxia
diff --git a/utils/url/url_test.go b/utils/url/url_test.go
index 2976f070..a467041a 100644
--- a/utils/url/url_test.go
+++ b/utils/url/url_test.go
@@ -1,16 +1,14 @@
 package url
 
 import (
-	"fmt"
+	"log"
 	"testing"
 )
 
 func TestLenCode(t *testing.T) {
-	u := "https://www.dtapp.net"
-	fmt.Println(LenCode(u))
+	log.Println(LenCode("https://www.dtapp.net"))
 }
 
 func TestDeCode(t *testing.T) {
-	u := "https%3A%2F%2Fwww.dtapp.net"
-	fmt.Println(DeCode(u))
+	log.Println(DeCode(LenCode("https://www.dtapp.net")))
 }