liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2023-07-17 14:44:45 +08:00
parent c6019bb278
commit de9a57540a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxcallback/orderman/orderman_ext.go
View File

@@ -1344,7 +1344,6 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in
VendorOrgCode string VendorOrgCode string
VendorStoreID string VendorStoreID string
} }
globals.SugarLogger.Debugf("dateVendorList============== :%s", utils.Format4Output(dateVendorList, false))
if len(dateVendorList) > 0 { if len(dateVendorList) > 0 {
var missingOrderList []*tOrderVendorPair var missingOrderList []*tOrderVendorPair
var updateOrderStatusList []*model.GoodsOrder var updateOrderStatusList []*model.GoodsOrder

9
business/model/dao/act.go
View File

@@ -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) { func GetActMtwmVendorPage(db *DaoDB, storeIDs, skuIDs []int, keyword string, beginAt, endAt time.Time, actType, offset, pageSize int) (page *model.PagedInfo, err error) {
var ( var (
acts []*model.ActMtwmVendor acts []*model.ActMtwmVendor
pageInfo *model.PagedInfo
) )
sql := ` sql := `
SELECT SQL_CALC_FOUND_ROWS b.name store_name ,a.* 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 { if err = GetRowsTx(txDB, &acts, sql, sqlParams...); err == nil {
page.TotalCount = GetLastTotalRowCount2(db, txDB) pageInfo.TotalCount = GetLastTotalRowCount2(db, txDB)
page.Data = acts pageInfo.Data = acts
} }
Commit(db, txDB) Commit(db, txDB)
return page, err return pageInfo, err
} }
// GetDontHaveSku 获取不存在此商品活动的门店 // GetDontHaveSku 获取不存在此商品活动的门店