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

controllers/wechat.go

@@ -121,13 +121,39 @@ func (c *WechatController) checkUser(val map[string]string) (map[string]interfac
 		return user, nil
 	}
 
-	if getUser == nil || getUser.CustomerId == "" {
+	// if getUser == nil || getUser.CustomerId == "" {
+	// 	// 新增用户
+	// 	_, err := c.custServ.SaveNewCustomer(user, "", "", "", "")
+	// 	if err != nil {
+	// 		utils.LogError("用户保存失败：", err)
+	// 		return user, nil
+	// 	}
+	// }
+
+	if getUser == nil || getUser.MappingId == "" {
 		// 新增用户
-		_, err := c.custServ.SaveNewCustomer(user, "", "", "", "")
+		newuser, err := c.custServ.SaveNewCustomer(user, "", "", "", "")
 		if err != nil {
 			utils.LogError("用户保存失败：", err)
 			return user, nil
 		}
+		accountInfo, err := json.Marshal(user)
+		if err != nil {
+			utils.LogError("转换失败", err)
+			return user, nil
+		}
+		userMapping := model.TaUserMapping{
+			UserId:      newuser.CustomerId,
+			AccountType: models.ACCMAP_WECHAT,
+			Openid:      openID,
+			AccountInfo: string(accountInfo),
+		}
+		_, err = c.custServ.EditUserMapping(&userMapping)
+		if err != nil {
+			utils.LogError("保存用户映射信息失败: " + err.Error())
+			return user, err
+		}
+
 	}
 
 	return user, nil

service/customer/customer.go

@@ -270,7 +270,6 @@ func (s *CustomerServ) BindWechatCust(userMap *model.TaUserMapping, phone, recom
 	// if cust.RecommendCase != "" {
 	evtEngID := utils.EngineIDBy(customer.OrgId, "")
 	evtEngine := utils.EventEngineBus(evtEngID)
-
 	evtEngine.EmitEvent(events.EvtRegiste, *cust)
 	// }
 
@@ -297,8 +296,8 @@ func (s *CustomerServ) SaveNewCustomer(wxInfo map[string]interface{}, caseID, ar
 
 	// 微信相关字段
 	nickyName := wxInfo["nickname"].(string)
-	headimgurl := wxInfo["headimgurl"].(string)
 
+	// sex := wxInfo["sex"].(string)
 	var sexInt int
 	switch val := wxInfo["sex"].(type) {
 	case string:
@@ -308,10 +307,10 @@ func (s *CustomerServ) SaveNewCustomer(wxInfo map[string]interface{}, caseID, ar
 	default:
 		sexInt = 1
 	}
-
 	if sexInt == 0 {
 		sexInt = 1 // 默认男性
 	}
+	headimgurl := wxInfo["headimgurl"].(string)
 
 	org := s.ctx.Get("org").(model.SysOrg)
 
@@ -428,3 +427,9 @@ func (s *CustomerServ) GetCustomerInfo() (map[string]interface{}, error) {
 		"vipbalance": balance,
 	}, nil
 }
+
+// EditUserMapping 更新用户map信息
+func (s *CustomerServ) EditUserMapping(userMap *model.TaUserMapping) (*model.TaUserMapping, error) {
+	err := models.EditUserMapping(userMap)
+	return userMap, err
+}