From 06410d5aacce9bb4a4c770bf5a25588e120d6c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 23 May 2025 14:54:19 +0800 Subject: [PATCH] 1 --- business/jxstore/cms/store_sku.go | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 578f9851d..e22010169 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -2282,13 +2282,11 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs // checkActDirectDown(ctx, skuBind, beforeMsg) } } - globals.SugarLogger.Debugf("--------skuBindInfo.StatusSaleBegin := %s", utils.Format4Output(skuBindInfo, false)) - globals.SugarLogger.Debugf("--------skuBindInfo.StatusSaleBegin1 := %s", utils.Format4Output(skuBindInfo.StatusSaleBegin != nil, false)) - globals.SugarLogger.Debugf("--------skuBindInfo.StatusSaleBegin2 := %s", utils.Format4Output(skuBindInfo.StatusSaleEnd != nil, false)) if skuBindInfo.StatusSaleBegin != nil && skuBindInfo.StatusSaleEnd != nil { - if err := ValidateStruct(skuBindInfo); err != nil { - globals.SugarLogger.Infof("更改商品:%s, 可售时间不合法!时间范围:[%v] 至 [%v]", allBinds[0].Name, skuBindInfo.StatusSaleBegin, skuBindInfo.StatusSaleEnd) - } else { + //if err := ValidateStruct(skuBindInfo); err != nil { + // globals.SugarLogger.Infof("更改商品:%s, 可售时间不合法!时间范围:[%v] 至 [%v]", allBinds[0].Name, skuBindInfo.StatusSaleBegin, skuBindInfo.StatusSaleEnd) + //} else { + if *skuBindInfo.StatusSaleBegin > *skuBindInfo.StatusSaleEnd || (*skuBindInfo.StatusSaleBegin == 0 && *skuBindInfo.StatusSaleEnd == 0) { if skuBind.StatusSaleBegin != *skuBindInfo.StatusSaleBegin || skuBind.StatusSaleEnd != *skuBindInfo.StatusSaleEnd { updateFieldMap["StatusSaleBegin"] = 1 updateFieldMap["StatusSaleEnd"] = 1 @@ -2296,11 +2294,8 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs skuBind.StatusSaleBegin = *skuBindInfo.StatusSaleBegin skuBind.StatusSaleEnd = *skuBindInfo.StatusSaleEnd } - } else { - updateFieldMap["StatusSaleBegin"] = 1 - updateFieldMap["StatusSaleEnd"] = 1 - skuBind.StatusSaleBegin = 0 - skuBind.StatusSaleEnd = 0 + + //} } if globals.IsAddEvent {