From 57ff6b161872d86952da4732899d144681c9f359 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, 29 Jun 2023 17:41:22 +0800
Subject: [PATCH] 1

---
 platformapi/tao_vegetable/order_afs.go  |  7 ++--
 platformapi/tao_vegetable/order_test.go | 43 ++++++++++++++++++++++++-
 platformapi/tao_vegetable/tao_consts.go |  2 +-
 3 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/platformapi/tao_vegetable/order_afs.go b/platformapi/tao_vegetable/order_afs.go
index 08a1e639..a14237fe 100644
--- a/platformapi/tao_vegetable/order_afs.go
+++ b/platformapi/tao_vegetable/order_afs.go
@@ -170,7 +170,7 @@ func (a *API) QueryAfsOrderDetailList(req *request591.AlibabaWdkOrderRefundListR
 func (a *API) GetTransactionOrderListByTime(storeId string, queryData time.Time) ([]string, error) {
 	createTime := util.LocalTime(time.Date(queryData.Year(), queryData.Month(), queryData.Day(), 0, 0, 0, 0, queryData.Location()))
 	endTime := util.LocalTime(time.Date(queryData.Year(), queryData.Month(), queryData.Day(), 23, 59, 59, 59, queryData.Location()))
-	var pageIndex int64 = 0
+	var pageIndex int64 = 1
 	var PageSize int64 = 200
 	param := &request591.AlibabaWdkOrderListRequest{
 		BatchQueryRequest: &domain591.AlibabaWdkOrderListBatchQueryRequest{
@@ -212,9 +212,8 @@ func (a *API) GetTransactionOrderList(req *request591.AlibabaWdkOrderListRequest
 
 	data, _ := client.AlibabaWdkOrderList(req, a.token)
 
-	if data.Result.ReturnCode != nil {
-		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))
-		return nil, fmt.Errorf(*data.Result.ReturnMsg)
+	if data.Result.Orders != nil {
+		return nil, fmt.Errorf("未查询到订单信息")
 	}
 
 	return &data.Result, nil
diff --git a/platformapi/tao_vegetable/order_test.go b/platformapi/tao_vegetable/order_test.go
index 24b4ba88..27dd369e 100644
--- a/platformapi/tao_vegetable/order_test.go
+++ b/platformapi/tao_vegetable/order_test.go
@@ -4,9 +4,12 @@ import (
 	"fmt"
 	domain591 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591/domain"
 	request591 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591/request"
+	"git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/util"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/globals"
+	"strings"
 	"testing"
+	"time"
 )
 
 func TestName(t *testing.T) {
@@ -40,16 +43,54 @@ func TestDeliveryFinishACCEPTED(t *testing.T) {
 	fmt.Println(err)
 }
 
+//5000894620268480922
+//5000894616420970922
+//5000894579364020922
 // 取消订单
 func TestDeliveryFinishREJECTED(t *testing.T) {
 	// 发送取消状态,商户取消
 	err := apiTao.DeliveryFinish(&request591.AlibabaAelophyOrderWorkCallbackRequest{
 		WorkCallbackRequest: &domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackRequest{
 			StoreId:    utils.String2Pointer("JX668594"),
-			BizOrderId: utils.Int64ToPointer(5000894158854290922),
+			BizOrderId: utils.Int64ToPointer(5000894579364020922),
 			Status:     utils.String2Pointer("REJECTED"),
 		},
 	})
 
 	fmt.Println(err)
 }
+
+func TestGetTransactionOrderList(t *testing.T) {
+	queryData := time.Now()
+	create := time.Date(queryData.Year(), queryData.Month(), queryData.Day(), 0, 0, 0, 0, queryData.Location())
+	end := time.Date(queryData.Year(), queryData.Month(), queryData.Day(), 23, 59, 59, 59, queryData.Location())
+	createTime := util.LocalTime(create)
+	endTime := util.LocalTime(end)
+	var pageIndex int64 = 1
+	var PageSize int64 = 20
+	param := &request591.AlibabaWdkOrderListRequest{
+		BatchQueryRequest: &domain591.AlibabaWdkOrderListBatchQueryRequest{
+			StoreIds:  &[]string{"JX668594"},
+			StartTime: &createTime,
+			EndTime:   &endTime,
+			OrderFrom: utils.Int64ToPointer(ChannelCome),
+			ShopId:    nil,
+			StoreId:   utils.String2Pointer("JX668594"),
+			BizType:   nil,
+		},
+	}
+	param.BatchQueryRequest.SetPageSize(PageSize)
+	param.BatchQueryRequest.SetPageIndex(pageIndex)
+
+	data, err := apiTao.GetTransactionOrderList(param)
+	globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false))
+	globals.SugarLogger.Debugf("err := %s", utils.Format4Output(err, false))
+}
+
+func TestCcc(t *testing.T) {
+	data := "{\n\t\"refundFee\": 100,\n\t\"merchantCode\": \"CSSJ\",\n\t\"refundReason\": \"退款原因\",\n\t\"subRefundOrders\": [\n\t\t{\n\t\t\t\"refundFee\": 100,\n\t\t\t\"maxRefundFee\": 200,\n\t\t\t\"outSubOrderId\": \"5018100091801\",\n\t\t\t\"refundAmount\": 2\n\t\t}\n\t],\n\t\"storeId\": \"S001\",\n\t\"refundDeliveryFee\": 0,\n\t\"refundPictures\": \"https://open-retail.ele.me/#/msgdoc/detail?topicName=order.partrefund.push\\u0026aopApiCategory=order_msg_group\\u0026type=push_menu\",\n\t\"bizRefundId\": \"50001110022\",\n\t\"outOrderId\": \"500120110121\",\n\t\"refundPackageFee\": 0,\n\t\"orderFrom\": 3,\n\t\"refundId\": \"50181000918\",\n\t\"remarks\": \"备注\"\n}"
+	resultParam := strings.ReplaceAll(strings.ReplaceAll(strings.ReplaceAll(data, "\n", ""), "\t", ""), " ", "")
+
+	resultParam2 := strings.ReplaceAll(resultParam, `\u0026`, "&")
+	fmt.Println(resultParam2)
+}
diff --git a/platformapi/tao_vegetable/tao_consts.go b/platformapi/tao_vegetable/tao_consts.go
index ca4de4a1..bb17fcb4 100644
--- a/platformapi/tao_vegetable/tao_consts.go
+++ b/platformapi/tao_vegetable/tao_consts.go
@@ -45,7 +45,7 @@ const (
 	CreateLabelStyleType       = "无价签"             // 保质期7天
 	OrderDeliveryTypeTime      = 1                 // 定时配送
 	OrderDeliveryTypeSelf      = 3                 // 用户自提
-	ChannelCome                = 4                 // 3：饿了么 4：盒马&淘鲜达 18:大润发飞牛 19:欧尚外卖 20：商家自有渠道
+	ChannelCome                = 31                // 3：饿了么 4：盒马&淘鲜达 18:大润发飞牛 19:欧尚外卖 20：商家自有渠道 31 ???
 )
 
 const (