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

修复添加商品可售时间引入的bug

Browse Source
This commit is contained in:
gazebo
2019-11-15 18:12:59 +08:00
parent ddbb1622fa
commit da69dd0216
1 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -329,13 +329,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo
if reorderHandler != nil { if reorderHandler != nil {
reorderSkuMap = make(map[string][]*dao.StoreSkuSyncInfo) reorderSkuMap = make(map[string][]*dao.StoreSkuSyncInfo)
} }
// now := jxutils.OperationTime2HourMinuteFormat(time.Now()) now := jxutils.OperationTime2HourMinuteFormat(time.Now())
for _, sku := range skus { for _, sku := range skus {
// if isUpdateSkuSaleStatus(sku, storeDetail, now) { sku.MergedStatus = MergeSkuSaleStatusWithStoreOpTime(sku, storeDetail, now)
// sku.MergedStatus = model.SkuStatusDontSale
// } else {
// sku.MergedStatus = model.SkuStatusNormal
// }
var bareSku *partner.StoreSkuInfo var bareSku *partner.StoreSkuInfo
isNeedReorder := false isNeedReorder := false
if isStoreSkuSyncNeedDelete(sku) { if isStoreSkuSyncNeedDelete(sku) {
@@ -807,7 +803,10 @@ func GetSensitiveWord(singleStoreHandler partner.ISingleStoreStoreSkuHandler, st
return "" return ""
} }
func isUpdateSkuSaleStatus(sku *dao.StoreSkuSyncInfo, storeDetail *dao.StoreDetail, now int16) bool { func MergeSkuSaleStatusWithStoreOpTime(sku *dao.StoreSkuSyncInfo, storeDetail *dao.StoreDetail, now int16) (outStatus int) {
if sku.MergedStatus == model.SkuStatusNormal &&
sku.StatusSaleBegin > 0 && sku.StatusSaleEnd > 0 &&
storeDetail.Status == model.StoreStatusOpened {
//商品可售时间的差集与门店营业时间的交集为不可售，其余为原本状态 //商品可售时间的差集与门店营业时间的交集为不可售，其余为原本状态
var openTime int16 var openTime int16
var closeTime int16 var closeTime int16
@@ -832,13 +831,14 @@ func isUpdateSkuSaleStatus(sku *dao.StoreSkuSyncInfo, storeDetail *dao.StoreDeta
beginAt2, endAt2 := GetTimeMixByInt(saleEndTime, 2400, openTime, closeTime) beginAt2, endAt2 := GetTimeMixByInt(saleEndTime, 2400, openTime, closeTime)
if beginAt1 != 0 && endAt1 != 0 { if beginAt1 != 0 && endAt1 != 0 {
if now >= beginAt1 && now < endAt1 { if now >= beginAt1 && now < endAt1 {
return true return model.SkuStatusDontSale
} }
} }
if beginAt2 != 0 && endAt2 != 0 { if beginAt2 != 0 && endAt2 != 0 {
if now >= beginAt2 && now < endAt2 { if now >= beginAt2 && now < endAt2 {
return true return model.SkuStatusDontSale
} }
} }
return false }
return sku.MergedStatus
} }