1

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 {

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
 	})
 }

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 {
+				globals.SugarLogger.Debugf("MTWMVendorStoreIDDontHaveMap := %s", utils.Format4Output(MTWMVendorStoreIDDontHaveMap, false))
-					ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "淘鲜达token过期", utils.Format4Output(MTWMVendorStoreIDDontHaveMap, false))
-				}
 				//c.Data["json"] = callbackResponse
 				c.Data["json"] = mtwmapi.Err2CallbackResponse(nil, "")
 				c.ServeJSON()