Browse Source

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

wangfei 6 years ago
parent
commit
8d3e0fc793
2 changed files with 12 additions and 1 deletions
  1. 0
    1
      controllers/luckdraw/luckdraw.go
  2. 12
    0
      service/cases/signin.go

+ 0
- 1
controllers/luckdraw/luckdraw.go View File

171
 	}
171
 	}
172
 
172
 
173
 	if from == nil || from.CustomerId == "" {
173
 	if from == nil || from.CustomerId == "" {
174
-		utils.LogError("分享人信息不存在: " + err.Error())
175
 		c.ResponseData(
174
 		c.ResponseData(
176
 			errIgnore,
175
 			errIgnore,
177
 			"分享人信息不存在",
176
 			"分享人信息不存在",

+ 12
- 0
service/cases/signin.go View File

3
 import (
3
 import (
4
 	"errors"
4
 	"errors"
5
 	"spaceofcheng/services/models/cases"
5
 	"spaceofcheng/services/models/cases"
6
+	"spaceofcheng/services/models/customer"
6
 	"spaceofcheng/services/models/marketing"
7
 	"spaceofcheng/services/models/marketing"
7
 	"spaceofcheng/services/models/model"
8
 	"spaceofcheng/services/models/model"
8
 	"spaceofcheng/services/utils"
9
 	"spaceofcheng/services/utils"
15
 type SigninServ struct {
16
 type SigninServ struct {
16
 	ctx     *utils.Context
17
 	ctx     *utils.Context
17
 	dao     *cases.SigninDAO
18
 	dao     *cases.SigninDAO
19
+	custDAO *customer.CustomerDAO
18
 	marDao  *marketing.MarketingDAO
20
 	marDao  *marketing.MarketingDAO
19
 	caseDao *cases.CaseDAO
21
 	caseDao *cases.CaseDAO
20
 }
22
 }
24
 	return &SigninServ{
26
 	return &SigninServ{
25
 		ctx:     ctx,
27
 		ctx:     ctx,
26
 		dao:     cases.NewSigninDAO(ctx),
28
 		dao:     cases.NewSigninDAO(ctx),
29
+		custDAO: customer.NewCustomerDAO(ctx),
27
 		marDao:  marketing.NewMarketingDAO(ctx),
30
 		marDao:  marketing.NewMarketingDAO(ctx),
28
 		caseDao: cases.NewCaseDAO(ctx),
31
 		caseDao: cases.NewCaseDAO(ctx),
29
 	}
32
 	}
98
 		return nil, err
101
 		return nil, err
99
 	}
102
 	}
100
 
103
 
104
+	if user.Phone == "" {
105
+		user.Phone = signin.Phone
106
+
107
+		// 如果有错误, 只记录不返回
108
+		if err := s.custDAO.UpdateCustomer(&user, []string{"phone"}); err != nil {
109
+			utils.LogError("更新用户手机失败: " + err.Error())
110
+		}
111
+	}
112
+
101
 	return &info, err
113
 	return &info, err
102
 }
114
 }
103
 
115