From 8dfacb9c2c96f87515fe634ccbbc5f599a9252ae 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, 21 Sep 2023 17:47:41 +0800
Subject: [PATCH] 1

---
 business/jxcallback/orderman/order.go              | 6 +++---
 business/jxstore/misc/misc.go                      | 2 +-
 business/model/dao/dao_order.go                    | 2 +-
 business/partner/purchase/tiktok_store/callback.go | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 506acb9f0..cd45039bf 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -2708,9 +2708,9 @@ func UpdateTaoSettleInfo() {
 	startTime := time.Date(timeStart.Year(), timeStart.Month(), timeStart.Day(), 0, 0, 0, 0, timeStart.Location())
 
 	timeEnd := time.Now()
-	endTiem := time.Date(timeEnd.Year(), timeEnd.Month(), timeEnd.Day()-1, 23, 59, 59, 0, timeStart.Location())
+	endTime := time.Date(timeEnd.Year(), timeEnd.Month(), timeEnd.Day()-1, 23, 59, 59, 0, timeStart.Location())
 
-	storeMaps, err := dao.GetTaoOrderVendor(db, startTime, endTiem)
+	storeMaps, err := dao.GetTaoOrderVendor(db, startTime, endTime)
 	if err != nil {
 		return
 	}
@@ -2718,7 +2718,7 @@ func UpdateTaoSettleInfo() {
 	for k, v := range storeMaps {
 		count++
 		globals.SugarLogger.Debugf("========storeID := %s", k)
-		settleInfo, err := tao.GetOrderTotalShopMoney(v, k, startTime, endTiem)
+		settleInfo, err := tao.GetOrderTotalShopMoney(v, k, startTime, endTime)
 		if err != nil {
 			globals.SugarLogger.Errorf("获取淘鲜达结算信息异常 := %v", err)
 			continue
diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 3c5c0a86f..706c1e046 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -204,7 +204,7 @@ func Init() {
 			"06:30:00",
 			"00:30:00",
 			"12:30:00",
-			"17:42:00",
+			"17:53:00",
 		})
 
 		// 每分钟轮询一次,推送骑手信息(假的订单)
diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index 182d8ff12..c714e0066 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -1907,7 +1907,7 @@ func GetTaoOrderVendor(db *DaoDB, startTime, endTime time.Time) (map[string]stri
 	param := []interface{}{startTime, endTime, model.VendorIDTaoVegetable, model.NO}
 	result := make([]*model.GoodsOrder, 0, 0)
 
-	if err := GetRows(db, result, sql, param); err != nil {
+	if err := GetRows(db, &result, sql, param); err != nil {
 		return nil, err
 	}
 
diff --git a/business/partner/purchase/tiktok_store/callback.go b/business/partner/purchase/tiktok_store/callback.go
index 5b4b15cdb..ee0eccd18 100644
--- a/business/partner/purchase/tiktok_store/callback.go
+++ b/business/partner/purchase/tiktok_store/callback.go
@@ -26,10 +26,10 @@ const (
 
 // OnOrderMsg 抖音
 func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackResponse) {
+	globals.SugarLogger.Debugf("GetTiktokApi msg := %s", utils.Format4Output(msg, false))
 	if CurPurchaseHandler != nil {
 		orderId, shopId, _ := api.TiktokStore.GetCallbackOrderId(msgId, msg)
 		orderDetail, err := GetTiktokApi(utils.Int64ToStr(shopId), 0, "").GetTiktokOrderDetail(orderId)
-		globals.SugarLogger.Debugf("GetTiktokApi msg := %s", utils.Format4Output(msg, false))
 		if err != nil {
 			return tiktokShop.Err2CallbackResponse(err, "")
 		}