From de9a57540aff654b897ac0f3af33818b19d42910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 17 Jul 2023 14:44:45 +0800 Subject: [PATCH] 1 --- business/jxcallback/orderman/orderman_ext.go | 1 - business/model/dao/act.go | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index c293d5d53..858a62124 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -1344,7 +1344,6 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in VendorOrgCode string VendorStoreID string } - globals.SugarLogger.Debugf("dateVendorList============== :%s", utils.Format4Output(dateVendorList, false)) if len(dateVendorList) > 0 { var missingOrderList []*tOrderVendorPair var updateOrderStatusList []*model.GoodsOrder diff --git a/business/model/dao/act.go b/business/model/dao/act.go index d09080bd9..62607c175 100644 --- a/business/model/dao/act.go +++ b/business/model/dao/act.go @@ -705,7 +705,8 @@ func GetActEbaiVendorSkus(db *DaoDB, storeIDs, skuIDs []int) (actEbaiVendorSku [ func GetActMtwmVendorPage(db *DaoDB, storeIDs, skuIDs []int, keyword string, beginAt, endAt time.Time, actType, offset, pageSize int) (page *model.PagedInfo, err error) { var ( - acts []*model.ActMtwmVendor + acts []*model.ActMtwmVendor + pageInfo *model.PagedInfo ) sql := ` SELECT SQL_CALC_FOUND_ROWS b.name store_name ,a.* @@ -750,11 +751,11 @@ func GetActMtwmVendorPage(db *DaoDB, storeIDs, skuIDs []int, keyword string, beg } }() if err = GetRowsTx(txDB, &acts, sql, sqlParams...); err == nil { - page.TotalCount = GetLastTotalRowCount2(db, txDB) - page.Data = acts + pageInfo.TotalCount = GetLastTotalRowCount2(db, txDB) + pageInfo.Data = acts } Commit(db, txDB) - return page, err + return pageInfo, err } // GetDontHaveSku 获取不存在此商品活动的门店