浏览代码

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

wangfei 6 年前
父节点
当前提交
367c850768
共有 2 个文件被更改,包括 5 次插入1 次删除
  1. 1
    1
      controllers/luckdraw/luckdraw.go
  2. 4
    0
      service/customer/customer.go

+ 1
- 1
controllers/luckdraw/luckdraw.go 查看文件

192
 
192
 
193
 	user := userRaw.(model.TaCustomer)
193
 	user := userRaw.(model.TaCustomer)
194
 
194
 
195
-	c.Context.Set("clienturl", c.Configer[controllers.AppConf].String("luckdrawNoticeURL"))
195
+	c.Context.Set("clienturl", c.Configer[controllers.WeChatConf].String("luckdrawNoticeURL"))
196
 	c.Context.Set("tplid", c.Configer[controllers.WeChatConf].String("luckdrawMessageTplID"))
196
 	c.Context.Set("tplid", c.Configer[controllers.WeChatConf].String("luckdrawMessageTplID"))
197
 
197
 
198
 	prize, detail, err := c.serv.LuckDraw(id, &user)
198
 	prize, detail, err := c.serv.LuckDraw(id, &user)

+ 4
- 0
service/customer/customer.go 查看文件

194
 
194
 
195
 	// 更新用户手机号码信息及userid信息
195
 	// 更新用户手机号码信息及userid信息
196
 	customer, err := s.dao.GetCustWithWXByOpenID(wxInfo.OpenID)
196
 	customer, err := s.dao.GetCustWithWXByOpenID(wxInfo.OpenID)
197
+	if err != nil {
198
+		return nil, utils.LogError("获取用户信息失败", err.Error())
199
+	}
200
+
197
 	newCust := model.TaCustomer{
201
 	newCust := model.TaCustomer{
198
 		CustomerId:  customer.CustomerId,
202
 		CustomerId:  customer.CustomerId,
199
 		Phone:       phone,
203
 		Phone:       phone,