修正時間計算方式

controllers/punchclock.go

@@ -89,7 +89,7 @@ func calcLeaveScope(params *beans.Punchclock) (diffDay int, diffHour int, diffMi
 	beginHour, beginMinute, endHour, endMinute = changeToLunchTime(beginTime, endTime, beginHour, beginMinute, endHour, endMinute)
 
 	if isSameDay(params) { //只請當天
-		if beginTime < 1200 && endTime > 1330 { //有跨午休
+		if beginTime < 1200 && endTime >= 1200 { //有跨午休
 			diffHour, diffMinute = calcTime(beginHour, endHour, beginMinute, endMinute, true)
 		} else { //沒跨午休
 			diffHour, diffMinute = calcTime(beginHour, endHour, beginMinute, endMinute, false)

env/env.swp

@@ -24,6 +24,10 @@ type Config struct {
 		Host     string
 		Protocol string
 	}
+	GoMyPay struct {
+		URL        string
+		CustomerID string
+	}
 }
 
 var cfg = &Config{}
@@ -45,6 +49,8 @@ func init() {
 	cfg.Mail.Password = ""
 	cfg.Redis.Host = "127.0.0.1:6379"
 	cfg.Redis.Protocol = "tcp"
+	cfg.GoMyPay.URL = "https://n.gomypay.asia/TestShuntClass.aspx"
+	cfg.GoMyPay.CustomerID = ""
 }
 
 //GetEnv 取得環境參數