From 34047548ed4184d38ca27d991a9dbdcb3f220a5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 19 Nov 2019 15:55:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 7893d72c0..9421f148c 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -740,11 +740,20 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
 			return 0, errors.New(fmt.Sprintf("门店营业时间1设置不合法！时间范围1 ：[%v] 至 [%v]", outStore.OpenTime1, outStore.CloseTime1))
 		}
 	}
+	if (outStore.OpenTime1 == 0 && outStore.CloseTime1 != 0) || (outStore.OpenTime1 != 0 && outStore.CloseTime1 == 0) {
+		return 0, errors.New(fmt.Sprintf("门店营业时间1设置不合法！时间范围1 ：[%v] 至 [%v]", outStore.OpenTime1, outStore.CloseTime1))
+	}
 	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 (outStore.OpenTime2 == 0 && outStore.CloseTime2 != 0) || (outStore.OpenTime2 != 0 && outStore.CloseTime2 == 0) {
+		return 0, errors.New(fmt.Sprintf("门店营业时间2设置不合法！时间范围2 ：[%v] 至 [%v]", outStore.OpenTime1, outStore.CloseTime1))
+	}
+	if outStore.OpenTime2 > outStore.OpenTime1 {
+		return 0, errors.New(fmt.Sprintf("门店营业时间设置不合法!第二段营业时间应该在第一段营业时间之后！"))
+	}
 	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))
 	}