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:
邹宗楠
2025-01-15 14:23:11 +08:00
parent bbe2a71c03
commit 6009eec666
2 changed files with 59 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
business/jxstore/cms/sync_store_sku.go
View File

@@ -818,6 +818,17 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
_, err = updateStoreSku(dao.GetDB(), vendorID, successList, model.SyncFlagNewMask)
}
// 保存被修改的商品提供记录
skuList := make([]string, 0, 0)
for _, v := range batchedStoreSkuList {
skuList = append(skuList, utils.Int2Str(v.SkuID))
}
skuSuccessList := make([]string, 0, 0)
for _, v := range successList {
skuSuccessList = append(skuSuccessList, utils.Int2Str(v.SkuID))
}
AddEventDetail(db, ctx, model.OperateUpdate, vendorID, model.ThingTypeSku, storeID, fmt.Sprintf("skuList:%s,time:%s", strings.Join(skuList, ","), utils.Time2TimeStr(time.Now())), fmt.Sprintf("skuSuccessList:%s", strings.Join(skuSuccessList, ",")))
if vendorID == model.VendorIDDD {
_, err = updateStoreSku(dao.GetDB(), vendorID, batchedStoreSkuList, model.SyncFlagNewMask)
}
@@ -837,6 +848,18 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
if len(successList) > 0 {
_, err = updateStoreSku(dao.GetDB(), vendorID, successList, model.SyncFlagModifiedMask)
}
// 保存被修改的商品提供记录
skuList := make([]string, 0, 0)
for _, v := range batchedStoreSkuList {
skuList = append(skuList, utils.Int2Str(v.SkuID))
}
skuSuccessList := make([]string, 0, 0)
for _, v := range successList {
skuSuccessList = append(skuSuccessList, utils.Int2Str(v.SkuID))
}
AddEventDetail(db, ctx, model.OperateUpdate, vendorID, model.ThingTypeSku, storeID, fmt.Sprintf("skuList:%s,time:%s", strings.Join(skuList, ","), utils.Time2TimeStr(time.Now())), fmt.Sprintf("skuSuccessList:%s", strings.Join(skuSuccessList, ",")))
return nil, len(successList), err
}, ctx, task, updateList, singleStoreHandler.GetStoreSkusBatchSize(partner.FuncUpdateStoreSkus), isContinueWhenError2)
}
@@ -879,6 +902,17 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
if len(successList) > 0 {
updateStoreSku(dao.GetDB(), vendorID, bareSku2Sync(successList), model.SyncFlagSaleMask)
}
// 保存被修改的商品提供记录
skuList := make([]string, 0, 0)
for _, v := range batchedStoreSkuList {
skuList = append(skuList, utils.Int2Str(v.SkuID))
}
skuSuccessList := make([]string, 0, 0)
for _, v := range successList {
skuSuccessList = append(skuSuccessList, utils.Int2Str(v.SkuID))
}
AddEventDetail(db, ctx, model.OperateUpdate, vendorID, model.ThingTypeSku, storeID, fmt.Sprintf("skuList:%s,status:%d", strings.Join(skuList, ","), status), fmt.Sprintf("skuSuccessList:%s", strings.Join(skuSuccessList, ",")))
return nil, len(successList), err
}, ctx, task, statusList, storeSkuHandler.GetStoreSkusBatchSize(partner.FuncUpdateStoreSkusStatus), isContinueWhenError2)
}

25
business/jxstore/report/report.go
View File

@@ -3,6 +3,7 @@ package report
import (
"errors"
"fmt"
"git.rosy.net.cn/jx-callback/business/jxstore/cms"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
"math"
@@ -41,6 +42,30 @@ func GetStatisticsReportForOrders(ctx *jxcontext.Context, storeIDs, vendorIDs []
if math.Ceil(toDateParm.Sub(fromDateParm).Hours()/24) > 92 {
return nil, errors.New(fmt.Sprintf("查询间隔时间不允许大于3个月！: 时间范围：[%v] 至 [%v]", fromDate, toDate))
}
if permission.IsRoled(ctx) {
if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil {
var storeIDs2 []int
if len(storeIDs) != 0 {
for _, v := range storeIDs {
if storeIDsMap[v] != 0 {
storeIDs2 = append(storeIDs2, v)
}
}
if len(storeIDs2) == 0 {
storeIDs2 = append(storeIDs2, -1)
}
} else {
for k, _ := range storeIDsMap {
storeIDs2 = append(storeIDs2, k)
}
roleInfo, _ := cms.GetUserRoleList(ctx, ctx.GetUserID())
for _, v := range roleInfo {
storeIDs2 = append(storeIDs2, v.StoreID)
}
}
}
}
statisticsReportForOrdersList, err = dao.GetStatisticsReportForOrders(db, storeIDs, vendorIDs, fromDateParm, toDateParm, marketPhone, jdPhone, mtPhone, ebaiPhone)
return statisticsReportForOrdersList, err
}