From 57f057cf4253544e86d9b5f4c1fc7ddc23e65f46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 22 Aug 2025 10:09:24 +0800
Subject: [PATCH] 1

---
 business/model/dao/lakala.go | 3 +++
 controllers/lakala.go        | 2 +-
 controllers/mtwm_callback.go | 4 +---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/business/model/dao/lakala.go b/business/model/dao/lakala.go
index 0dc19e3da..00bde8ac3 100644
--- a/business/model/dao/lakala.go
+++ b/business/model/dao/lakala.go
@@ -1,6 +1,7 @@
 package dao
 
 import (
+	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"time"
 )
@@ -369,6 +370,8 @@ func QueryApplyContractList(orderNo string, storeID, pageSize, offset int) (page
 	ORDER BY r.id desc
 	LIMIT ? OFFSET ?
 	`
+	pageSize = jxutils.FormalizePageSize(pageSize)
+	offset = jxutils.FormalizePageOffset(offset)
 	param = append(param, pageSize, offset)
 
 	if err = GetRowsTx(txDB, &recipient, sql, param...); err == nil {
diff --git a/controllers/lakala.go b/controllers/lakala.go
index b03987b66..9f3a58a73 100644
--- a/controllers/lakala.go
+++ b/controllers/lakala.go
@@ -911,7 +911,7 @@ func (c *LaKaLaController) WithdrawalList() {
 // @router /QueryApplyContractList [get]
 func (c *LaKaLaController) QueryApplyContractList() {
 	c.callQueryApplyContractList(func(params *tLakalaQueryApplyContractListParams) (retVal interface{}, errCode string, err error) {
-		retVal, err = lakalaServer.QueryApplyContractList(params.OrderNo, params.StoreId, params.PageSize, params.PageSize)
+		retVal, err = lakalaServer.QueryApplyContractList(params.OrderNo, params.StoreId, params.PageSize, params.Offset)
 		return
 	})
 }
diff --git a/controllers/mtwm_callback.go b/controllers/mtwm_callback.go
index 6d30e460f..5ceeaf05f 100644
--- a/controllers/mtwm_callback.go
+++ b/controllers/mtwm_callback.go
@@ -52,9 +52,7 @@ func (c *MtwmController) onCallbackMsg(msgType string) {
 				case model.ServerTypePet:
 					callbackResponse = mtwmapi.Err2CallbackResponse(nil, "") // mtwmapi.Err2CallbackResponse(fmt.Errorf("美团菜市推果园,果园退超市未找到门店cmd:%s,storeId:%s", msgType, vendorStoreId), "")
 				}
-				if time.Now().Hour() > 9 && time.Now().Hour() < 10 {
-					ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "淘鲜达token过期", utils.Format4Output(MTWMVendorStoreIDDontHaveMap, false))
-				}
+				globals.SugarLogger.Debugf("MTWMVendorStoreIDDontHaveMap := %s", utils.Format4Output(MTWMVendorStoreIDDontHaveMap, false))
 				//c.Data["json"] = callbackResponse
 				c.Data["json"] = mtwmapi.Err2CallbackResponse(nil, "")
 				c.ServeJSON()