随机码

models/customerremark/customerremark.go

@@ -20,6 +20,12 @@ type CustomerCardCoupon struct {
 	VerifyStatus string
 	ReceiveDate  time.Time
 }
+type customerHistory struct {
+	model.TaSaleCustomerRemark `xorm:"extends"`
+	Name                       string
+	CustomerName               string
+	Phone                      string
+}
 
 // NewCustomerRemarkDAO New Inst
 func NewCustomerRemarkDAO(ctx *utils.Context) *CustomerRemarkDAO {
@@ -28,16 +34,20 @@ func NewCustomerRemarkDAO(ctx *utils.Context) *CustomerRemarkDAO {
 		db:  ctx.DB,
 	}
 }
-func (m *CustomerRemarkDAO) GetRemarkList(salesId, customerId string, page, pageSize int) ([]model.TaSaleCustomerRemark, error) {
-	var remark []model.TaSaleCustomerRemark
+func (m *CustomerRemarkDAO) GetRemarkList(salesId, customerId string, page, pageSize int) ([]customerHistory, error) {
+	var remark []customerHistory
 	sql := `SELECT
-	* 
+	a.*,
+	b.name,
+	b.customer_name,
+	b.phone
 FROM
-	ta_sale_customer_remark 
+	ta_sale_customer_remark a
+	INNER JOIN ta_customer b ON a.customer_id = b.customer_id
 WHERE
-	sales_id = '` + salesId + `'
-	and customer_id = '` + customerId + `'
-	order by create_date desc limit ` + strconv.Itoa(page-1) + `, ` + strconv.Itoa(pageSize)
+	a.sales_id = '` + salesId + `'
+	and a.customer_id = '` + customerId + `'
+	order by a.create_date desc limit ` + strconv.Itoa(page-1) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&remark)
 	return remark, err
 }

models/model/ta_sale_customer_remark.go

@@ -7,6 +7,8 @@ import (
 type TaSaleCustomerRemark struct {
 	SalesCustomerRemarkId string    `xorm:"not null VARCHAR(64)"`
 	SaleCustomerId        string    `xorm:"VARCHAR(64)"`
+	CustomerId            string    `xorm:"VARCHAR(64)"`
+	SalesId               string    `xorm:"VARCHAR(64)"`
 	RemarkTitle           string    `xorm:"VARCHAR(256)"`
 	Remark                string    `xorm:"TEXT"`
 	CreateDate            time.Time `xorm:"DATETIME"`

models/system/user.go

@@ -33,6 +33,10 @@ type UserListInfo struct {
 	model.SysUser `xorm:"extends"`
 	UserTypeNames string
 }
+type CustomerInfo struct {
+	model.TaCustomer `xorm:"extends"`
+	Remark           string
+}
 
 // GetUserList 用户列表
 func (m *UserDAO) GetUserList(username, typeid, caseids string, page int, pageSize int) ([]UserListInfo, error) {
@@ -404,11 +408,12 @@ func (m *UserDAO) UpdateCustomerHeadImg(customerid, username, imgurl string) err
 }
 
 // GetUserCustomer 获取我的推荐客户
-func (m *UserDAO) GetUserCustomer(userid, isrecommend, key string, page int, pageSize int) ([]model.TaCustomer, error) {
-	var customers []model.TaCustomer
-	sql := `select * from ta_customer where (recommend_id='` + userid + `'`
+func (m *UserDAO) GetUserCustomer(userid, isrecommend, key string, page int, pageSize int) ([]CustomerInfo, error) {
+	var customers []CustomerInfo
+	sql := `select a.*,
+	( SELECT remark FROM ta_sale_customer_remark b WHERE a.customer_id = b.customer_id ORDER BY b.create_date DESC LIMIT 1 ) AS remark from ta_customer a where (a.recommend_id='` + userid + `'`
 	if isrecommend == "" || isrecommend == "false" {
-		sql += ` or customer_id in (
+		sql += ` or a.customer_id in (
 			select customer_id from ta_customer_coupon where sales_id='` + userid + `'
 			union 
 			select customer_id from ta_customer_card where sales_id='` + userid + `'
@@ -416,10 +421,10 @@ func (m *UserDAO) GetUserCustomer(userid, isrecommend, key string, page int, pag
 	}
 	sql += ")"
 	if key != "" {
-		sql += ` and (customer_name like '%` + key + `%' or phone like '%` + key + `%' or name like '%` + key + `%')`
+		sql += ` and (a.customer_name like '%` + key + `%' or a.phone like '%` + key + `%' or a.name like '%` + key + `%')`
 	}
 	offset := (page - 1) * pageSize
-	sql += ` order by create_date desc LIMIT ` + strconv.Itoa(pageSize) + ` OFFSET ` + strconv.Itoa(offset)
+	sql += ` order by a.create_date desc LIMIT ` + strconv.Itoa(pageSize) + ` OFFSET ` + strconv.Itoa(offset)
 	err := m.db.Sql(sql).Find(&customers)
 	return customers, err
 }

service/user.go

@@ -169,6 +169,23 @@ func (s *UserServ) SaveUser(user system.SysUserForm) (*model.SysUser, error) {
 	userInfo.Email = user.Email
 	userInfo.Phone = user.Phone
 	userInfo.Headimgurl = user.Headimgurl
+	var flag bool = true
+	for i := 0; i < 4; i++ {
+		code := s.dao.GenerateRecommendCode()
+		i, err := s.dao.IsCodeExist(code)
+		if err != nil {
+			return nil, errors.New("生成推荐码失败！请重新点击保存。")
+		}
+		if i <= 0 {
+			userInfo.RecommendCode = code
+			flag = false
+			break
+		}
+
+	}
+	if flag {
+		return nil, errors.New("生成推荐码失败！请重新点击保存。")
+	}
 
 	org := s.ctx.Get("org").(model.SysOrg)
 	user.OrgId = org.OrgId
@@ -428,7 +445,7 @@ func (s *UserServ) SaveUserRole(userid, roleids string) error {
 }
 
 // GetUserCustomer 获取我的推荐客户
-func (s *UserServ) GetUserCustomer(userid, isrecommend, key string, page int, pageSize int) ([]model.TaCustomer, error) {
+func (s *UserServ) GetUserCustomer(userid, isrecommend, key string, page int, pageSize int) ([]system.CustomerInfo, error) {
 	if pageSize == 0 {
 		pageSize = PAGENUM
 	}