diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index f7cac1325..24972b6bd 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -619,7 +619,6 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa } outStore := &model.Store{} valid := dao.StrictMakeMapByStructObject2(payload, store, outStore, userName) - fmt.Println(outStore) if err = checkStoreDeliveryRange(utils.Interface2String(valid["deliveryRange"])); err != nil { return 0, err } @@ -736,18 +735,18 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa } //时间校验 - if store.OpenTime1 != 0 && store.CloseTime1 != 0 { - if err := ValidateStructPartial(store, "OpenTime1", "CloseTime1"); err != nil { - return 0, errors.New(fmt.Sprintf("门店营业时间1设置不合法!时间范围1 :[%v] 至 [%v]", store.OpenTime1, store.CloseTime1)) + if outStore.OpenTime1 != 0 && outStore.CloseTime1 != 0 { + if err := ValidateStructPartial(outStore, "OpenTime1", "CloseTime1"); err != nil { + return 0, errors.New(fmt.Sprintf("门店营业时间1设置不合法!时间范围1 :[%v] 至 [%v]", outStore.OpenTime1, outStore.CloseTime1)) } } - if store.OpenTime2 != 0 && store.CloseTime2 != 0 { - if err := ValidateStructPartial(store, "OpenTime2", "CloseTime2"); err != nil { - return 0, errors.New(fmt.Sprintf("门店营业时间2设置不合法!时间范围2 :[%v] 至 [%v]", store.OpenTime2, store.CloseTime2)) + if outStore.OpenTime2 != 0 && outStore.CloseTime2 != 0 { + if err := ValidateStructPartial(outStore, "OpenTime2", "CloseTime2"); err != nil { + return 0, errors.New(fmt.Sprintf("门店营业时间2设置不合法!时间范围2 :[%v] 至 [%v]", outStore.OpenTime2, outStore.CloseTime2)) } } - if beginAt, endAt := GetTimeMixByInt(store.OpenTime1, store.CloseTime1, store.OpenTime2, store.CloseTime2); beginAt != 0 && endAt != 0 { - return 0, errors.New(fmt.Sprintf("两段门店营业时间不可交叉!时间范围1 :[%v] 至 [%v], 时间范围2 :[%v] 至 [%v]", store.OpenTime1, store.CloseTime1, store.OpenTime2, store.CloseTime2)) + if beginAt, endAt := GetTimeMixByInt(outStore.OpenTime1, outStore.CloseTime1, outStore.OpenTime2, outStore.CloseTime2); beginAt != 0 && endAt != 0 { + return 0, errors.New(fmt.Sprintf("两段门店营业时间不可交叉!时间范围1 :[%v] 至 [%v], 时间范围2 :[%v] 至 [%v]", outStore.OpenTime1, outStore.CloseTime1, outStore.OpenTime2, outStore.CloseTime2)) } // districtCode := 0