From 1265658cbdc012791ab93302bca37d3f1f240112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 26 Sep 2023 15:03:42 +0800
Subject: [PATCH] 1

---
 platformapi/jdapi/store_page_test.go    |  2 +-
 platformapi/tao_vegetable/order_afs.go  |  8 ++------
 platformapi/tao_vegetable/order_test.go | 11 +++++++----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/platformapi/jdapi/store_page_test.go b/platformapi/jdapi/store_page_test.go
index b5ebf987..4e80efcd 100644
--- a/platformapi/jdapi/store_page_test.go
+++ b/platformapi/jdapi/store_page_test.go
@@ -211,7 +211,7 @@ func TestC(t *testing.T) {
 //}
 //
 func TestGetJdUpcCodeByName(t *testing.T) {
-	result, err := api.GetJdUpcCodeByName("", "6934660528526", 1, 5)
+	result, err := api.GetJdUpcCodeByName("", "6902890227083", 1, 5)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/platformapi/tao_vegetable/order_afs.go b/platformapi/tao_vegetable/order_afs.go
index 714ed40f..1a9f77ce 100644
--- a/platformapi/tao_vegetable/order_afs.go
+++ b/platformapi/tao_vegetable/order_afs.go
@@ -241,12 +241,8 @@ func (a *API) QueryBillList(req *request591.AlibabaWdkBillListRequest) (*domain5
 	globals.SugarLogger.Debugf("进入 QueryBillList : %s", utils.Format4Output(req, false))
 	client := ability591.NewAbility591(&a.client)
 
-	data, err := client.AlibabaWdkBillList(req, a.token)
-	if err != nil {
-		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(err, false))
-		return nil, err
-	}
-	if !*data.ApiResult.Success {
+	data, _ := client.AlibabaWdkBillList(req, a.token)
+	if data != nil && !*data.ApiResult.Success {
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))
 		return nil, fmt.Errorf(*data.ApiResult.ErrMsg)
 	}
diff --git a/platformapi/tao_vegetable/order_test.go b/platformapi/tao_vegetable/order_test.go
index 95424bdb..078bfb84 100644
--- a/platformapi/tao_vegetable/order_test.go
+++ b/platformapi/tao_vegetable/order_test.go
@@ -228,10 +228,10 @@ func TestDeliveryTrajectory(t *testing.T) {
 
 func TestQueryBillList(t *testing.T) {
 	queryData := time.Now()
-	create := time.Date(queryData.Year(), queryData.Month(), queryData.Day()-90, 0, 0, 0, 0, queryData.Location())
-	end := time.Date(queryData.Year(), queryData.Month(), queryData.Day(), 23, 59, 59, 59, queryData.Location())
+	create := time.Date(queryData.Year(), queryData.Month(), queryData.Day()-26, 0, 0, 0, 0, queryData.Location())
+	end := time.Date(queryData.Year(), queryData.Month(), queryData.Day()-14, 23, 59, 59, 59, queryData.Location())
 
-	data, err := GetOrderTotalShopMoney("", "JX100002", create, end)
+	data, err := GetOrderTotalShopMoney("", "JX668429", create, end)
 
 	globals.SugarLogger.Debugf("data:= %s", utils.Format4Output(data, false))
 	globals.SugarLogger.Debugf("data:= %s", utils.Format4Output(err, false))
@@ -262,7 +262,10 @@ func GetOrderTotalShopMoney(appOrgCode string, vendorStoreID string, start, end
 	}
 
 	var totalIndex int64 = 0
-	result, _ := api.QueryBillList(param)
+	result, err := api.QueryBillList(param)
+	if err != nil {
+		return nil, err
+	}
 	for _, v := range *result.TxdBillDetailBOS {
 		if *v.OrderType == "positive" {
 			settlement[*v.BizOrderId] = *v.ReceivableAmount