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

level, jdsorder 30minu

Browse Source
This commit is contained in:
苏尹岚
2020-10-16 18:14:54 +08:00
parent 30433d0ebf
commit f6feb80971
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
business/jxstore/cms/store_sku.go
View File

@@ -1079,6 +1079,11 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
if err != nil || storeDetail == nil {
continue
}
if len(storeIDs) > 1 {
if storeDetail.StoreLevel == "D" || storeDetail.StoreLevel == "E" {
continue
}
}
scaleFactor := float64(1)
if isScale {
scaleFactor = 100 / float64(jxutils.ConstrainPayPercentage(storeDetail.PayPercentage))
@@ -3367,6 +3372,11 @@ func FocusStoreSkusBySku(ctx *jxcontext.Context, skuBindInfos []*StoreSkuBindInf
storeID := skuBindInfo.StoreID
skuID := skuBindInfo.Skus[0].SkuID
store, err := dao.GetStoreDetail(db, storeID, -1)
if len(skuBindInfos) > 1 {
if store.StoreLevel == "D" || store.StoreLevel == "E" {
return retVal, err
}
}
if err != nil {
return retVal, err
}

10
business/jxstore/cms/sync.go
View File

@@ -650,17 +650,9 @@ func (v *VendorSync) AmendAndPruneStoreStuff(ctx *jxcontext.Context, vendorIDs [
func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, parentTask tasksch.ITask, db *dao.DaoDB, taskName string, isAsync, isManageIt bool, vendorIDs []int, storeIDs []int, mustDirty bool, handler tasksch.WorkFunc, isContinueWhenError bool) (task tasksch.ITask, hint string, err error) {
var storeMapList []*model.StoreMap
var storeMapList2 []*model.StoreMap
if storeMapList2, err = dao.GetStoresMapList2(db, vendorIDs, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "", mustDirty); err != nil {
if storeMapList, err = dao.GetStoresMapList2(db, vendorIDs, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "", mustDirty); err != nil {
return nil, "", err
}
if len(storeIDs) == 1 {
storeMapList = storeMapList2
} else {
for _, v := range storeMapList2 {
storeList, _ := dao.GetStoreList(db, []int{v.StoreID}, nil, nil, nil, "")
}
}
if len(storeMapList) == 0 {
return nil, "", nil
}

4
business/partner/purchase/jdshop/callback.go
View File

@@ -219,7 +219,7 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
if time2 == "" {
order.ExpectedDeliveredTime = order.OrderCreatedAt.Add(time.Hour)
} else {
order.ExpectedDeliveredTime = utils.Str2Time(time2).Add(-time.Minute * 30)
order.ExpectedDeliveredTime = utils.Str2Time(time2)
}
}
order.PickDeadline = order.ExpectedDeliveredTime.Add(-time.Hour)
@@ -233,7 +233,7 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
if msg.IDSopShipmenttype == jdshopapi.IdSopShipmenttypeTC {
if time2, err := api.JdShopAPI.GetOrderExtInfoByOrderId(order.VendorOrderID2); err == nil {
order.BusinessType = model.BusinessTypeDingshida
order.ExpectedDeliveredTime = utils.Str2Time(time2).Add(-time.Minute * 30)
order.ExpectedDeliveredTime = utils.Str2Time(time2)
}
}
setJdsOrderSeq(order)