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

conf/log.conf

@@ -1,4 +1,4 @@
 [common]
-filename="E:\\GoProject\\src\\spaceofcheng\\services\\log\\common.log"
+filename="E:\\GoProjects\\src\\spaceofcheng\\services\\log\\common.log"
 # log level "emergency", "alert", "critical", "error", "warning", "notice", "info", "debug"
 level="debug"

controllers/luckdraw/luckdraw.go

@@ -143,7 +143,7 @@ func (c *LuckDrawController) GetRecordByID() {
 		c.ResponseError(errors.New("校验奖品记录失败"))
 	}
 
-	c.ResponseJson(map[string]interface{}{
+	c.ResponseJSON(map[string]interface{}{
 		"record":      record,
 		"prize":       prize,
 		"caseAddress": caseAddress,
@@ -151,50 +151,84 @@ func (c *LuckDrawController) GetRecordByID() {
 }
 
 func (c *LuckDrawController) SaveShareRecord() {
+	errIgnore := "error-ignore"
+
 	id := c.GetString(":id")
 
 	fromID := c.GetString("from")
 	if fromID == "" {
-		c.ResponseError(errors.New("没有分享人ID"))
+		c.ResponseData(
+			errIgnore,
+			"没有分享人ID",
+			http.StatusBadRequest,
+		)
 	}
 
 	from, err := c.bodydao.GetCustomerByID(fromID)
 	if err != nil {
 		utils.LogError("获取分享人信息失败: " + err.Error())
-		c.ResponseError(errors.New("获取分享人信息失败"))
+		c.ResponseData(
+			errIgnore,
+			"获取分享人信息失败",
+			http.StatusBadRequest,
+		)
 	}
 
 	if from == nil || from.CustomerId == "" {
 		utils.LogError("分享人信息不存在: " + err.Error())
-		c.ResponseError(errors.New("分享人信息不存在"))
+		c.ResponseData(
+			errIgnore,
+			"分享人信息不存在",
+			http.StatusBadRequest,
+		)
 	}
 
 	current = c.Context.Get("customer")
 
 	// 自己分享给自己
 	if from.CustomerId == current.CustomerId {
-		c.ResponseError(errors.New("本人分享内容无效"))
+		c.ResponseData(
+			errIgnore,
+			"本人分享内容无效",
+			http.StatusBadRequest,
+		)
 	}
 
 	luckdraw, err := c.dao.GetLuckDrawByID(id)
 	if err != nil {
 		utils.LogError("获取抽奖信息失败: " + err.Error())
-		c.ResponseError(errors.New("获取抽奖信息失败"))
+		c.ResponseData(
+			errIgnore,
+			"获取抽奖信息失败",
+			http.StatusBadRequest,
+		)
 	}
 
 	if luckdraw == nil {
 		utils.LogError("获取抽奖信息失败: " + err.Error())
-		c.ResponseError(errors.New("没有找到 id (" + id + ") 对应的抽奖信息"))
+		c.ResponseData(
+			errIgnore,
+			"没有找到 id ("+id+") 对应的抽奖信息",
+			http.StatusBadRequest,
+		)
 	}
 
 	existsRec, err := c.dao.GetLuckDrawShareData(from.Id, current.Id, luckdraw.Id, luckdraw.CaseId)
 	if err != nil {
 		utils.LogError("获取已有分享信息失败: " + err.Error())
-		c.ResponseError(errors.New("获取已有分享信息失败"))
+		c.ResponseData(
+			errIgnore,
+			"获取已有分享信息失败",
+			http.StatusBadRequest,
+		)
 	}
 
 	if existsRec != nil && len(existsRec) > 0 {
-		c.ResponseError(errors.New("已分享记录, 再次分享无效"))
+		c.ResponseData(
+			errIgnore,
+			"已分享记录, 再次分享无效",
+			http.StatusBadRequest,
+		)
 	}
 
 	shareDt := model.TaShareLuckyRecord{
@@ -213,7 +247,11 @@ func (c *LuckDrawController) SaveShareRecord() {
 
 	if err := c.dao.SaveLuckDrawShareData(&shareDt); err != nil {
 		utils.LogError("保存分享记录失败: " + err.Error())
-		c.ResponseError(errors.New("保存分享记录失败"))
+		c.ResponseData(
+			errIgnore,
+			"保存分享记录失败",
+			http.StatusBadRequest,
+		)
 	}
 
 	c.ResponseJSON("ok")

controllers/user/user.go

@@ -209,6 +209,7 @@ func (c *UserController) SignOut() {
 	user := c.Context.Get("user").(model.SysUser)
 	c.Context.Set("user", nil)
 	c.SetTokenExipre(user.UserId)
+	c.ResponseJSON("ok")
 }
 
 // GetEnvVars 获取当前用户相关

models/luckdraw/luckdraw.go

@@ -278,7 +278,7 @@ func (m *LuckDrawDao) GetPrizeStock(luckdrawid string) ([]model.TaLuckdrawPrize,
 }
 
 // GetPrizeByID 根据id获取奖品信息
-func (m *LuckDrawDao) GetPrizeByID(id int) (model.TaLuckdrawPrize, error) {
+func (m *LuckDrawDao) GetPrizeByID(id string) (model.TaLuckdrawPrize, error) {
 	var prize = model.TaLuckdrawPrize{}
 	_, err := m.db.Where("id=?", id).Get(&prize)
 	return prize, err