bug修改

log/common.log

@@ -164,3 +164,167 @@
 2018/09/20 17:30:45 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
 2018/09/20 17:30:45 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
 2018/09/20 17:30:48 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 17:43:49 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 17:43:50 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 17:43:50 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 17:43:51 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 17:44:09 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 17:47:00 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 18:07:53 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 18:07:53 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 18:07:57 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 18:07:57 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 18:08:01 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 18:08:01 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 18:08:02 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 18:57:07 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 18:57:08 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 18:57:12 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 18:57:12 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 18:57:12 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 18:57:45 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 18:57:46 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 18:57:46 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 18:58:36 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 18:58:36 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 18:58:36 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 18:58:55 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 18:58:55 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 18:58:55 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 19:19:39 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 19:19:39 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 19:19:39 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 19:19:39 [E] 获取项目列表失败: Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 3
+2018/09/20 19:20:04 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 19:20:04 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 19:20:05 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 19:20:13 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 19:20:13 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 19:21:03 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 19:21:10 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 19:21:10 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 19:21:10 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 19:22:46 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:22:46 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:22:46 [E] 统计本月饮品下单失败: Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'group,
+			sum(IFNULL(s.amount, 0)) AS amount
+		FROM (
+	
+SELECT
+	DATE_FORMAT(
+		D' at line 3
+2018/09/20 19:22:46 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:35:29 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 19:35:30 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 19:35:30 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 19:35:30 [E] 统计本月饮品下单失败: Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'group,
+			sum(IFNULL(s.amount, 0)) AS amount
+		FROM (
+	
+SELECT
+	DATE_FORMAT(
+		D' at line 3
+2018/09/20 19:35:40 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:35:41 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:35:41 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:35:41 [E] 统计本月饮品下单失败: Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'group,
+			sum(IFNULL(s.amount, 0)) AS amount
+		FROM (
+	
+SELECT
+	DATE_FORMAT(
+		D' at line 3
+2018/09/20 19:35:41 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:36:20 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:36:21 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:36:21 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:38:39 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:38:39 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:39:11 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:39:11 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:39:15 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:39:15 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:39:15 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:39:17 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:39:17 [E] 统计本月饮品下单失败: Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'group,
+			sum(IFNULL(s.amount, 0)) AS amount
+		FROM (
+	
+SELECT
+	DATE_FORMAT(
+		D' at line 3
+2018/09/20 19:39:17 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:39:21 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:39:24 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:39:24 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:39:25 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:39:25 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:39:29 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:39:30 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:39:30 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:39:31 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:39:33 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:39:35 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:39:52 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:39:52 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:40:02 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:40:02 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:40:16 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:40:16 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:40:16 [E] 统计本月饮品下单失败: Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'group,
+			sum(IFNULL(s.amount, 0)) AS amount
+		FROM (
+	
+SELECT
+	DATE_FORMAT(
+		D' at line 3
+2018/09/20 19:40:19 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:40:40 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:40:40 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:41:00 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:41:00 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:41:00 [E] 统计本月饮品下单失败: Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'group,
+			sum(IFNULL(s.amount, 0)) AS amount
+		FROM (
+	
+SELECT
+	DATE_FORMAT(
+		D' at line 3
+2018/09/20 19:41:03 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:41:51 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:43:05 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:43:12 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:43:12 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:43:19 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:43:23 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:43:25 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:43:26 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:44:03 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:44:03 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:44:04 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:44:24 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:44:24 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:44:24 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:45:28 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:45:28 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:45:28 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:49:49 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:49:49 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:50:15 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:50:16 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:50:16 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:50:56 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:50:57 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:51:45 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:51:46 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:51:50 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:51:50 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:51:50 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:51:53 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:52:22 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:52:48 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:53:27 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:53:28 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:53:28 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:53:30 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:53:35 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36

models/message/cmscase.go

@@ -23,11 +23,11 @@ const (
 )
 
 // GetCmsCaseList 获取项目专题列表
-func (m *MessageDAO) GetCmsCaseList(name, caseids string, page int, pageSize int) ([]CmsCaseInfo, error) {
+func (m *MessageDAO) GetCmsCaseList(name, caseids, userid string, page int, pageSize int) ([]CmsCaseInfo, error) {
 	var cases []CmsCaseInfo
-	sql := `select a.*,b.case_name from ta_cms_case a inner join sys_case b on a.case_id = b.case_id 
-	where a.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and a.name like '%` + name + `%' and a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
-	and b.status > ` + strconv.Itoa(models.STATUS_DEL) + `
+	sql := `select a.*, (case when a.case_id='all' then '所有案场' else b.case_name end) case_name from ta_cms_case a LEFT join sys_case b on a.case_id = b.case_id 
+	where (a.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') OR (a.create_user='` + userid + `' and a.case_id='all')) and a.name like '%` + name + `%' and a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
+	and (b.status > ` + strconv.Itoa(models.STATUS_DEL) + ` or a.case_id='all')
 	order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&cases)
 	return cases, err
@@ -43,11 +43,11 @@ func (m *MessageDAO) GetCmsCaseByOrg(orgid string) ([]CmsCase, error) {
 }
 
 // GetCmsCaseListCount 获取项目专题Count
-func (m *MessageDAO) GetCmsCaseListCount(name, caseids string) (int, error) {
+func (m *MessageDAO) GetCmsCaseListCount(name, caseids, userid string) (int, error) {
 	var cases []CmsCaseInfo
-	sql := `select a.*,b.case_name from ta_cms_case a inner join sys_case b on a.case_id = b.case_id 
-	where a.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and a.name like '%` + name + `%' 
-	and a.status > ` + strconv.Itoa(models.STATUS_DEL) + ` and b.status > ` + strconv.Itoa(models.STATUS_DEL)
+	sql := `select a.*, (case when a.case_id='all' then '所有案场' else b.case_name end) case_name from ta_cms_case a LEFT join sys_case b on a.case_id = b.case_id 
+	where(a.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') OR (a.create_user='` + userid + `' and a.case_id='all')) and a.name like '%` + name + `%' 
+	and a.status > ` + strconv.Itoa(models.STATUS_DEL) + ` and (b.status > ` + strconv.Itoa(models.STATUS_DEL) + ` or a.case_id='all')`
 
 	err := m.db.Sql(sql).Find(&cases)
 	if err != nil {
@@ -67,7 +67,7 @@ type CmsCase struct {
 // GetCmsCaseByID 获取项目专题详情
 func (m *MessageDAO) GetCmsCaseByID(cmscaseid string) (*CmsCase, error) {
 	var cases []CmsCase
-	sql := `select a.*,b.case_address from ta_cms_case a inner join sys_case b on a.case_id=b.case_id where a.cms_case_id='` + cmscaseid + `' and b.status>` + strconv.Itoa(models.STATUS_DEL) + ` and a.status>` + strconv.Itoa(models.STATUS_DEL)
+	sql := `select a.*,b.case_address from ta_cms_case a left join sys_case b on a.case_id=b.case_id where a.cms_case_id='` + cmscaseid + `' and (b.status>` + strconv.Itoa(models.STATUS_DEL) + ` or a.case_id='all') and a.status>` + strconv.Itoa(models.STATUS_DEL)
 	err := m.db.Sql(sql).Find(&cases)
 	if err != nil {
 		beego.Error(err)

models/models.go

@@ -20,7 +20,7 @@ func NewDBEngine() *xorm.Engine {
 	dns := getMySQLDNS()
 
 	engine, err := xorm.NewEngine(dbType, dns)
-	engine.ShowSQL()
+	// engine.ShowSQL()
 
 	if err != nil {
 		panic(err)

models/statistics/dashboard.go

@@ -328,7 +328,7 @@ func (m *StatisticsDAO) GetGoodsWithTypeDaily(orgID string, caseIDs []string) ([
 	sql := `
 		SELECT
 			t.dt,
-			s.type_name as group,
+			s.type_name as 'group',
 			sum(IFNULL(s.amount, 0)) AS amount
 		FROM (
 	`
@@ -343,7 +343,6 @@ func (m *StatisticsDAO) GetGoodsWithTypeDaily(orgID string, caseIDs []string) ([
 	}
 
 	sql += ` group by t.dt, s.type_name`
-
 	var res []StaCommGroupData
 	if err := m.db.SQL(sql).Find(&res); err != nil {
 		return nil, err

models/system/user.go

@@ -343,7 +343,7 @@ func (m *UserDAO) UpdateCustomerHeadImg(customerid, username, imgurl string) err
 func (m *UserDAO) GetUserCustomer(userid, isrecommend, key string, page int, pageSize int) ([]model.TaCustomer, error) {
 	var customers []model.TaCustomer
 	sql := `select * from ta_customer where recommend_id='` + userid + `'`
-	if isrecommend == "" {
+	if isrecommend == "" || isrecommend == "false" {
 		sql += ` and customer_id in (
 			select customer_id from ta_customer_coupon where sales_id='` + userid + `'
 			union 

service/message/cmscase.go

@@ -19,12 +19,13 @@ func (s *MessageServ) GetCmsCasesList(name, caseids string, page int, pageSize i
 	if page == 0 {
 		page = 1
 	}
-	infos, err := s.dao.GetCmsCaseList(name, caseids, page, pageSize)
+	user := s.ctx.Get("user").(model.SysUser)
+	infos, err := s.dao.GetCmsCaseList(name, caseids, user.UserId, page, pageSize)
 	if err != nil {
 		utils.LogError("获取项目列表失败: " + err.Error())
 		return nil, errors.New("获取项目列表失败")
 	}
-	total, err := s.dao.GetCmsCaseListCount(name, caseids)
+	total, err := s.dao.GetCmsCaseListCount(name, caseids, user.UserId)
 	if err != nil {
 		utils.LogError("获取项目列表失败: " + err.Error())
 		return nil, errors.New("获取项目列表失败")