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

- fixed bug in calculate max parallelCount in tasksch.RunTask

Browse Source 
- multi-task for stores in jd.SyncStoreSkus
- calculate platform price use platform price_percentage.
- GoodsOrder json StoreName.
This commit is contained in:
gazebo
2018-10-11 10:21:43 +08:00
parent d58e03619d
commit 9ad1e383f8
4 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
business/partner/purchase/jd/store_sku.go
View File

@@ -3,6 +3,7 @@ package jd
import (
"git.rosy.net.cn/baseapi/platformapi/jdapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
@@ -11,41 +12,53 @@ import (
)
const (
MaxStockQty = 100000000
MaxStockQty = 100000000
MaxSkuBatchSize = 50
)
type tStoreSkuBindExt struct {
model.StoreSkuBind
PricePercentage int
}
// 京东到家，以有库存表示关注（认领）
func (p *PurchaseHandler) SyncStoreSkus(db *dao.DaoDB, storeIDs []int, skuIDs []int, isForce bool, userName string) (err error) {
var storeSkus []*model.StoreSkuBind
for _, storeID := range storeIDs {
parallelCount := 1
if len(skuIDs) < MaxSkuBatchSize {
parallelCount = 10
}
task := tasksch.RunManagedTask("SyncStoreSkus", false, nil, parallelCount, 1, userName, func(batchItemList []interface{}, params ...interface{}) (interface{}, error) {
storeID := batchItemList[0].(int)
sqlParams := []interface{}{
utils.DefaultTimeValue,
storeID,
}
sql := `
SELECT *
FROM store_sku_bind
WHERE (deleted_at = ? OR jd_sync_status <> 0) AND store_id = ?
`
SELECT t1.*, t2.price_percentage
FROM store_sku_bind t1
JOIN store_map t2 ON t1.store_id = t2.store_id
WHERE (t1.deleted_at = ? OR t1.jd_sync_status <> 0) AND t1.store_id = ?
`
if skuIDs != nil && len(skuIDs) > 0 {
sql += " AND sku_id IN (" + dao.GenQuestionMarks(len(skuIDs)) + ")"
sql += " AND t1.sku_id IN (" + dao.GenQuestionMarks(len(skuIDs)) + ")"
sqlParams = append(sqlParams, skuIDs)
}
globals.SugarLogger.Debug(sql, sqlParams)
var storeSkus []*tStoreSkuBindExt
// globals.SugarLogger.Debug(sql, sqlParams)
if err = dao.GetRows(db, &storeSkus, sql, sqlParams); err == nil {
outStationNo := utils.Int2Str(storeID)
task := tasksch.RunTask("", false, nil, 10, 50, userName, func(batchItemList []interface{}, params ...interface{}) (interface{}, error) {
task := tasksch.RunTask("", false, nil, 0, MaxSkuBatchSize, userName, func(batchItemList []interface{}, params ...interface{}) (interface{}, error) {
var skuPriceInfoList []*jdapi.SkuPriceInfo
var skuVendibilityList []*jdapi.StockVendibility
var skuStockList []*jdapi.SkuStock
for _, v := range batchItemList {
storeSku := v.(*model.StoreSkuBind)
storeSku := v.(*tStoreSkuBindExt)
if storeSku.JdSyncStatus&model.SyncFlagChangedMask != 0 {
if storeSku.JdSyncStatus&(model.SyncFlagPriceMask|model.SyncFlagNewMask) != 0 || isForce {
skuPriceInfoList = append(skuPriceInfoList, &jdapi.SkuPriceInfo{
OutSkuId: utils.Int2Str(storeSku.SkuID),
Price: storeSku.Price,
Price: jxutils.CaculateSkuVendorPrice(storeSku.Price, storeSku.PricePercentage),
})
}
if storeSku.JdSyncStatus&(model.SyncFlagSaleMask|model.SyncFlagNewMask) != 0 || isForce {
@@ -85,16 +98,19 @@ func (p *PurchaseHandler) SyncStoreSkus(db *dao.DaoDB, storeIDs []int, skuIDs []
}, storeSkus)
if _, err = task.GetResult(0); err == nil {
sql := `
UPDATE store_sku_bind
SET jd_sync_status = 0
WHERE store_id = ?
`
UPDATE store_sku_bind
SET jd_sync_status = 0
WHERE (t1.deleted_at = ? OR t1.jd_sync_status <> 0) AND t1.store_id = ?
`
if skuIDs != nil && len(skuIDs) > 0 {
sql += " AND sku_id IN (" + dao.GenQuestionMarks(len(skuIDs)) + ")"
}
_, err = dao.ExecuteSQL(db, sql, sqlParams)
}
}
}
return nil, err
}, storeIDs)
_, err = task.GetResult(0)
return err
}