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

controllers/luckdraw/luckdraw.go

@@ -192,7 +192,7 @@ func (c *LuckDrawController) LuckDraw() {
 
 	user := userRaw.(model.TaCustomer)
 
-	c.Context.Set("clienturl", c.Configer[controllers.AppConf].String("luckdrawNoticeURL"))
+	c.Context.Set("clienturl", c.Configer[controllers.WeChatConf].String("luckdrawNoticeURL"))
 	c.Context.Set("tplid", c.Configer[controllers.WeChatConf].String("luckdrawMessageTplID"))
 
 	prize, detail, err := c.serv.LuckDraw(id, &user)

service/customer/customer.go

@@ -194,6 +194,10 @@ func (s *CustomerServ) BindWechatCust(userMap *model.TaUserMapping, phone, recom
 
 	// 更新用户手机号码信息及userid信息
 	customer, err := s.dao.GetCustWithWXByOpenID(wxInfo.OpenID)
+	if err != nil {
+		return nil, utils.LogError("获取用户信息失败", err.Error())
+	}
+
 	newCust := model.TaCustomer{
 		CustomerId:  customer.CustomerId,
 		Phone:       phone,