Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/services into dev

models/luckdrawlist/luckdrawlist.go

@@ -43,7 +43,7 @@ func (m *LuckdrawDAO) GetLuckdrawList(filters []string, limit []int) ([]Luckdraw
 	sql := `SELECT
 	a.* ,
 	c.case_name,
-	b.name AS ActivitName,
+	b.name AS activit_name,
 	d.name,
 	d.customer_name,
 	d.phone
@@ -89,8 +89,8 @@ func (m *LuckdrawDAO) GetLuckdrawById(luckdrawId, caseids string) (*Luckdraw, er
 	sql := `SELECT
 	a.*,
 	c.case_name,
-	b.NAME AS ActivitName,
-	d.NAME,
+	b.name AS activit_name,
+	d.name,
 	d.customer_name,
 	d.phone 
 FROM

service/sys.go

@@ -278,6 +278,11 @@ func (s *SysServ) authWechat(gctx *context.Context) map[string]interface{} {
 		}
 	}
 
+	// 防止JSON解析失败
+	if userMapping.AccountInfo == "" {
+		userMapping.AccountInfo = "{}"
+	}
+
 	// 更新映射信息, 没有的话则插入
 	err = models.EditUserMapping(userMapping)
 	if err != nil {