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

conf/db.conf

@@ -5,8 +5,8 @@ db_type      = mysql
 con_protocol = tcp
 
 ; 数据库地址，可以使用IP
-db_addr      = 192.168.0.122
-# db_addr      = localhost
+# db_addr      = 192.168.0.122
+db_addr      = localhost
 
 ; 端口
 db_port      = 3306

controllers/card/card.go

@@ -86,12 +86,6 @@ func (c *CardController) GetCardByID() {
 	})
 }
 
-// GetMyCard 获取我的卡券
-// 微信端
-func (c *CardController) GetMyCard() {
-
-}
-
 // SaveCard 保存卡
 func (c *CardController) SaveCard() {
 	jsnStr := c.GetString("info")
@@ -172,3 +166,8 @@ func (c *CardController) GiveCard() {
 
 	c.ResponseJSON("ok")
 }
+
+// GetCardWithCustomer 获取卡及领取信息
+func (c *CardController) GetCardWithCustomer() {
+
+}

controllers/coupon/coupon.go

@@ -189,3 +189,13 @@ func (c *CouponController) GetCouponWithCustomer() {
 
 	c.ResponseJSON(couponDetail)
 }
+
+// GetCouponByCustomer 获取我的优惠券信息
+func (c *CouponController) GetCouponByCustomer() {
+	coupons, err := c.serv.GetCouponByCustomer()
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(coupons)
+}

controllers/goods/order.go

@@ -102,12 +102,10 @@ func (c *GoodsController) PostOrder() {
 	}
 
 	// 订单优惠券
-	coupon := c.GetString("coupon")
-
+	customercouponid := c.GetString("customercouponid")
 	//
 	var orderInfo model.TaGoodsOrders
 	var orderDetail []model.TaGoodsOrdersDetail
-	var orderCoupon []model.TaGoodsOrdersCoupon
 
 	if err := json.Unmarshal([]byte(info), &orderInfo); err != nil {
 		utils.LogError("下单转换JSON失败: " + err.Error())
@@ -119,10 +117,10 @@ func (c *GoodsController) PostOrder() {
 		c.ResponseError(errors.New("详情数据格式不正确"))
 	}
 
-	if err := json.Unmarshal([]byte(coupon), &orderCoupon); err != nil {
-		utils.LogError("下单优惠转换JSON失败: " + err.Error())
-		c.ResponseError(errors.New("优惠数据格式不正确"))
-	}
+	// if err := json.Unmarshal([]byte(coupon), &orderCoupon); err != nil {
+	// 	utils.LogError("下单优惠转换JSON失败: " + err.Error())
+	// 	c.ResponseError(errors.New("优惠数据格式不正确"))
+	// }
 	cust := c.Context.Get("customer").(model.TaCustomer)
 
 	if cust.Phone == "" {
@@ -132,7 +130,7 @@ func (c *GoodsController) PostOrder() {
 		)
 	}
 
-	if err := c.serv.Orders(&orderInfo, orderDetail, orderCoupon); err != nil {
+	if err := c.serv.Orders(&orderInfo, orderDetail, customercouponid); err != nil {
 		c.ResponseError(err)
 	}
 

controllers/user/user.go

@@ -144,7 +144,8 @@ func (c *UserController) GetUserCustomer() {
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
 	isrecommend := c.GetString("isrecommend")
-	customers, err := c.dao.GetUserCustomer(customer.UserId, isrecommend, page, pageSize)
+	key := c.GetString("key")
+	customers, err := c.dao.GetUserCustomer(customer.UserId, isrecommend, key, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}

models/card/card.go

@@ -274,3 +274,31 @@ func (m *CardDAO) GetCustomerCardByUser(caseid, userid string) ([]model.TaCustom
 	err := m.db.Where("case_id=?", caseid).And("sales_id=?", userid).And("status>?", models.STATUS_DEL).Find(&customerCards)
 	return customerCards, err
 }
+
+// GetCardWithCustomer 获取优惠券明细
+func (m *CardDAO) GetCardWithCustomer(cardid string) (*CaseUsableCard, error) {
+	var card = new(CaseUsableCard)
+	sql := `select * from ta_card where coupin_id=?`
+	_, err := m.db.Sql(sql, cardid).Get(&card)
+	if err != nil {
+		return nil, err
+	}
+	if card == nil || card.CardId == "" {
+		return nil, errors.New("无优惠券信息")
+	}
+	var customerCopons []model.TaCustomerCard
+	sql = `select * from ta_customer_card where card_id = ? and status>?`
+	err = m.db.Sql(sql, card, models.STATUS_DEL).Find(&customerCopons)
+	if err != nil {
+		return nil, err
+	}
+	card.CustomerCard = customerCopons
+	return card, nil
+}
+
+// GetCardByCustomer 获取我的体验卡
+func (m *CardDAO) GetCardByCustomer(orgid, customerid string) ([]model.TaCustomerCard, error) {
+	var cards []model.TaCustomerCard
+	err := m.db.Where("status>?", models.STATUS_DEL).And("customer_id=?", customerid).And("org_id=?", orgid).Find(&cards)
+	return cards, err
+}

models/coupon/coupon.go

@@ -89,6 +89,35 @@ func (m *CouponDAO) GetCouponInfoByID(id string) (*CouponInfo, error) {
 	return cp, nil
 }
 
+// GetCouponInfoByCustomerCouponID 获取优惠券详情
+func (m *CouponDAO) GetCouponInfoByCustomerCouponID(id string) (*CouponInfo, error) {
+	cp := new(CouponInfo)
+
+	query := `
+		SELECT
+			a.*
+		FROM
+			ta_coupon a 
+			inner join ta_customer_coupon b 
+			on a.coupon_id = b.coupon_id
+		WHERE
+			b.customer_coupon_id = ?
+	`
+
+	if _, err := m.db.SQL(query, id).Get(cp); err != nil {
+		return nil, err
+	}
+	// 关联目标
+	var targes []model.TaCouponTarget
+	if err := m.db.Where("coupon_id=?", cp.CouponId).Find(&targes); err != nil {
+		return nil, err
+	}
+
+	cp.Targets = targes
+
+	return cp, nil
+}
+
 // GetCouponList 获取优惠券列表
 func (m *CouponDAO) GetCouponList(filters []string, limit []int) ([]model.TaCoupon, int64, error) {
 	var cps []model.TaCoupon
@@ -317,7 +346,7 @@ func (m *CouponDAO) GetCustomerCouponByUser(caseid, userid string) ([]model.TaCu
 }
 
 // GetCouponWithCustomer 获取优惠券明细
-func (m CouponDAO) GetCouponWithCustomer(couponid string) (*CaseCouponDetail, error) {
+func (m *CouponDAO) GetCouponWithCustomer(couponid string) (*CaseCouponDetail, error) {
 	var coupon = new(CaseCouponDetail)
 	sql := `select * from ta_coupon where coupin_id=?`
 	_, err := m.db.Sql(sql, couponid).Get(&coupon)
@@ -336,3 +365,75 @@ func (m CouponDAO) GetCouponWithCustomer(couponid string) (*CaseCouponDetail, er
 	coupon.CustomerCoupon = customerCopons
 	return coupon, nil
 }
+
+// GetCouponByCustomer 获取我的优惠券信息
+func (m *CouponDAO) GetCouponByCustomer(orgid, customerid string) ([]CustomerCoupon, error) {
+	var coupons []CustomerCoupon
+	sql := `select * from ta_customer_coupon where status>? and customer_id=? and org_id=?`
+	err := m.db.Sql(sql, models.STATUS_DEL, customerid, orgid).Find(&coupons)
+	// err := m.db.Where("status>?", models.STATUS_DEL).And("customer_id=?", customerid).And("org_id=?", orgid).Find(&coupons)
+	for inx, coupon := range coupons {
+		info, err := m.GetCouponInfoByID(coupon.CouponId)
+		if err != nil {
+			return nil, err
+		}
+		coupons[inx].Coupon = info
+	}
+	return coupons, err
+}
+
+// GetCustomerCouponByID 获取我的优惠券想想
+func (m *CouponDAO) GetCustomerCouponByID(id string) (*model.TaCustomerCoupon, error) {
+	if id == "" {
+		return nil, errors.New("无优惠券信息")
+	}
+	var customerCoupon = new(model.TaCustomerCoupon)
+	_, err := m.db.Where("customer_coupon_id=?", id).Get(&customerCoupon)
+	return customerCoupon, err
+}
+
+// GetCouponWithTarget 获取优惠券与关联信息
+func (m *CouponDAO) GetCouponWithTarget(ids string) ([]CouponInfo, error) {
+	var cp []CouponInfo
+
+	query := `
+		SELECT
+			*
+		FROM
+			ta_coupon
+		WHERE
+			coupon_id in ('` + strings.Replace(ids, ",", "','", -1) + `')
+	`
+
+	if err := m.db.SQL(query).Find(&cp); err != nil {
+		return nil, err
+	}
+
+	for i, c := range cp {
+		// 关联目标
+		var targes []model.TaCouponTarget
+		if err := m.db.Where("coupon_id=?", c.CouponId).Find(&targes); err != nil {
+			return nil, err
+		}
+		cp[i].Targets = targes
+	}
+
+	return cp, nil
+}
+
+// VerifyCustomerCoupon 核销客户优惠券
+func (m *CouponDAO) VerifyCustomerCoupon(id string) error {
+	var customerCoupon = model.TaCustomerCoupon{
+		CustomerCouponId: id,
+		UseDate:          time.Now(),
+	}
+	var cols = []string{
+		"area_name",
+		"area_icon",
+		"area_icon_white",
+		"order",
+		"case_id",
+	}
+	_, err := m.db.Cols(cols...).Where("customer_coupon_id=?", id).Update(customerCoupon)
+	return err
+}

models/coupon/types.go

@@ -24,3 +24,9 @@ type CaseCouponDetail struct {
 	model.TaCoupon `xorm:"extends"`
 	CustomerCoupon []model.TaCustomerCoupon
 }
+
+// CustomerCoupon 用户优惠券
+type CustomerCoupon struct {
+	model.TaCustomerCoupon `xorm:"extends"`
+	Coupon                 *CouponInfo
+}

models/goods/orders.go

@@ -73,42 +73,46 @@ func (m *GoodsDAO) SaveOrdersDetail(list []model.TaGoodsOrdersDetail, ordersID s
 }
 
 // SaveOrdersCoupon 保存订单优惠券
-func (m *GoodsDAO) SaveOrdersCoupon(coupons []model.TaGoodsOrdersCoupon, order *model.TaGoodsOrders) error {
+func (m *GoodsDAO) SaveOrdersCoupon(coupons *model.TaGoodsOrdersCoupon, order *model.TaGoodsOrders) error {
 	if order.OrdersId == "" {
 		return errors.New("内部错误, 订单事务顺序出错")
 	}
 
-	var couponAmount float64 = 0
-
-	// 补充优惠券表字段
-	for inx := range coupons {
-		coupons[inx].OrdersCouponId = guid.NewGUIDString()
-		coupons[inx].OrdersId = order.OrdersId
-		coupons[inx].OrdersNo = order.OrdersNo
-		coupons[inx].OrgId = order.OrgId
-		coupons[inx].Status = models.STATUS_NORMAL
-		coupons[inx].CreateDate = time.Now().Local()
-
-		userAmount, _ := strconv.ParseFloat(coupons[inx].UsedAmount, 64)
-		couponAmount += userAmount
-	}
-
-	// 反向更新 订单主表
-	totalAmount, _ := strconv.ParseFloat(order.Amount, 64)
-
-	order.CouponAmount = strconv.FormatFloat(couponAmount, 'f', -1, 32)
-	order.ActualAmount = strconv.FormatFloat((totalAmount - couponAmount), 'f', -1, 32)
-
-	if _, err := m.db.Insert(&coupons); err != nil {
+	if _, err := m.db.Insert(coupons); err != nil {
 		return err
 	}
 
-	if _, err := m.db.
-		Where("orders_id=?", order.OrdersId).
-		Cols([]string{"coupon_amount", "actual_amount"}...).
-		Update(order); err != nil {
-		return err
-	}
+	// var couponAmount float64 = 0
+
+	// // 补充优惠券表字段
+	// for inx := range coupons {
+	// 	coupons[inx].OrdersCouponId = guid.NewGUIDString()
+	// 	coupons[inx].OrdersId = order.OrdersId
+	// 	coupons[inx].OrdersNo = order.OrdersNo
+	// 	coupons[inx].OrgId = order.OrgId
+	// 	coupons[inx].Status = models.STATUS_NORMAL
+	// 	coupons[inx].CreateDate = time.Now().Local()
+
+	// 	userAmount, _ := strconv.ParseFloat(coupons[inx].UsedAmount, 64)
+	// 	couponAmount += userAmount
+	// }
+
+	// // 反向更新 订单主表
+	// totalAmount, _ := strconv.ParseFloat(order.Amount, 64)
+
+	// order.CouponAmount = strconv.FormatFloat(couponAmount, 'f', -1, 32)
+	// order.ActualAmount = strconv.FormatFloat((totalAmount - couponAmount), 'f', -1, 32)
+
+	// if _, err := m.db.Insert(&coupons); err != nil {
+	// 	return err
+	// }
+
+	// if _, err := m.db.
+	// 	Where("orders_id=?", order.OrdersId).
+	// 	Cols([]string{"coupon_amount", "actual_amount"}...).
+	// 	Update(order); err != nil {
+	// 	return err
+	// }
 
 	return nil
 }

models/system/user.go

@@ -340,7 +340,7 @@ func (m *UserDAO) UpdateCustomerHeadImg(customerid, username, imgurl string) err
 }
 
 // GetUserCustomer 获取我的推荐客户
-func (m *UserDAO) GetUserCustomer(userid, isrecommend string, page int, pageSize int) ([]model.TaCustomer, error) {
+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 + `'`
 	if isrecommend == "" {
@@ -350,6 +350,9 @@ func (m *UserDAO) GetUserCustomer(userid, isrecommend string, page int, pageSize
 			select customer_id from ta_customer_card where sales_id='` + userid + `'
 		)`
 	}
+	if key != "" {
+		sql += ` and (customer_name like '%` + key + `%' or phone like '%` + key + `%' or name like '%` + key + `%')`
+	}
 	offset := (page - 1) * pageSize
 	sql += ` order by create_date desc LIMIT ` + strconv.Itoa(pageSize) + ` OFFSET ` + strconv.Itoa(offset)
 	err := m.db.Sql(sql).Find(&customers)

routers/common.go

@@ -260,6 +260,7 @@ func getCommonRoutes() beego.LinkNamespace {
 
 		// 签到
 		beego.NSRouter("/case/signin", &cases.SigninController{}, "get:GetSigninWhere"),
+		beego.NSRouter("/case/signin", &cases.SigninController{}, "post:AddSignin"),
 
 		// websocket
 		beego.NSRouter("/websocket/:grps/:id", &controllers.BaseController{}, "get:Ws"),

routers/wechat.go

@@ -1,6 +1,8 @@
 package routers
 
 import (
+	"spaceofcheng/services/controllers/card"
+	"spaceofcheng/services/controllers/coupon"
 	"spaceofcheng/services/controllers/course"
 	"spaceofcheng/services/controllers/customer"
 	"spaceofcheng/services/controllers/goods"
@@ -17,6 +19,8 @@ func getWechatRoutes() beego.LinkNamespace {
 		// 会员
 		beego.NSRouter("/customer", &customer.CustomerController{}, "get:GetCustWXByID"),
 		beego.NSRouter("/customer/user", &user.UserController{}, "get:GetUserCustomer"),
+		beego.NSRouter("/customer/coupon", &coupon.CouponController{}, "get:GetCouponByCustomer"),
+		// beego.NSRouter("/customer/card", &card.CardController{}, "get:GetCardByCustomer"),
 
 		// 下单
 		beego.NSRouter("/order/goods", &goods.GoodsController{}, "post:PostOrder"),
@@ -45,5 +49,13 @@ func getWechatRoutes() beego.LinkNamespace {
 		// 用户
 		beego.NSRouter("/user/:type", &user.UserController{}, "get:GetCaseUserByType"),
 		beego.NSRouter("/user/detail/:id", &user.UserController{}, "get:GetCaseUserByID"),
+
+		// 优惠券
+		beego.NSRouter("/coupon/:id", &coupon.CouponController{}, "get:GetCouponByID"),
+		beego.NSRouter("/coupon/detail/:id", &coupon.CouponController{}, "get:GetCouponWithCustomer"),
+
+		// 卡
+		beego.NSRouter("/card/:id", &card.CardController{}, "get:GetCardByID"),
+		beego.NSRouter("/card/detail/:id", &card.CardController{}, "get:GetCardWithCustomer"),
 	)
 }

service/card/card.go

@@ -274,3 +274,28 @@ func (s *CardServ) GetCardByIDWithCheck(cardID string) (*card.CardInfo, error) {
 
 	return card, nil
 }
+
+// GetCardWithCustomer 获取优惠券明细
+func (s *CardServ) GetCardWithCustomer(cardid string) (*card.CaseUsableCard, error) {
+	if cardid == "" {
+		return nil, errors.New("没有卡信息！")
+	}
+	cardDetail, err := s.dao.GetCardDetail(cardid)
+	if err != nil {
+		utils.LogError("获取优惠券失败: " + err.Error())
+		return nil, errors.New("获取优惠券失败")
+	}
+	return cardDetail, nil
+}
+
+// GetCardByCustomer 获取我的优惠券
+func (s *CardServ) GetCardByCustomer() ([]model.TaCustomerCard, error) {
+	org := s.ctx.Get("org").(model.SysOrg)
+	customer := s.ctx.Get("customer").(model.TaCustomer)
+	cards, err := s.dao.GetCardByCustomer(org.OrgId, customer.CustomerId)
+	if err != nil {
+		utils.LogError("获取体验卡失败: " + err.Error())
+		return nil, errors.New("获取体验卡失败")
+	}
+	return cards, nil
+}

service/coupon/coupon.go

@@ -364,7 +364,7 @@ func (s *CouponServ) GetCouponBySendType(sendtype string) ([]model.TaCoupon, err
 	coupon, err := s.dao.GetCouponBySendType(caseIDs, sendtype)
 	if err != nil {
 		utils.LogError("获取优惠券失败: " + err.Error())
-		return nil, errors.New("校验优惠券失败")
+		return nil, errors.New("获取优惠券失败")
 	}
 	return coupon, nil
 }
@@ -381,3 +381,15 @@ func (s *CouponServ) GetCouponWithCustomer(couponid string) (*coupon.CaseCouponD
 	}
 	return couponDetail, nil
 }
+
+// GetCouponByCustomer 获取我的优惠券
+func (s *CouponServ) GetCouponByCustomer() ([]coupon.CustomerCoupon, error) {
+	org := s.ctx.Get("org").(model.SysOrg)
+	customer := s.ctx.Get("customer").(model.TaCustomer)
+	coupons, err := s.dao.GetCouponByCustomer(org.OrgId, customer.CustomerId)
+	if err != nil {
+		utils.LogError("获取优惠券失败: " + err.Error())
+		return nil, errors.New("获取优惠券失败")
+	}
+	return coupons, nil
+}

service/goods/goods.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/cases"
+	"spaceofcheng/services/models/coupon"
 	"spaceofcheng/services/models/customer"
 	"spaceofcheng/services/models/goods"
 	"spaceofcheng/services/models/model"
@@ -14,21 +15,23 @@ import (
 
 // GoodsServ 系统处理
 type GoodsServ struct {
-	ctx     *utils.Context
-	dao     *goods.GoodsDAO
-	caseDAO *cases.CaseDAO
-	custDAO *customer.CustomerDAO
-	userDAO *system.UserDAO
+	ctx       *utils.Context
+	dao       *goods.GoodsDAO
+	caseDAO   *cases.CaseDAO
+	custDAO   *customer.CustomerDAO
+	userDAO   *system.UserDAO
+	couponDAO *coupon.CouponDAO
 }
 
 // NewGoodsServ 初始化
 func NewGoodsServ(ctx *utils.Context) *GoodsServ {
 	return &GoodsServ{
-		ctx:     ctx,
-		dao:     goods.NewGoodsDAO(ctx),
-		caseDAO: cases.NewCaseDAO(ctx),
-		custDAO: customer.NewCustomerDAO(ctx),
-		userDAO: system.NewUserDAO(ctx),
+		ctx:       ctx,
+		dao:       goods.NewGoodsDAO(ctx),
+		caseDAO:   cases.NewCaseDAO(ctx),
+		custDAO:   customer.NewCustomerDAO(ctx),
+		userDAO:   system.NewUserDAO(ctx),
+		couponDAO: coupon.NewCouponDAO(ctx),
 	}
 }
 

service/goods/orders.go

@@ -20,7 +20,7 @@ import (
 func (s *GoodsServ) Orders(
 	info *model.TaGoodsOrders,
 	details []model.TaGoodsOrdersDetail,
-	coupons []model.TaGoodsOrdersCoupon) error {
+	customercouponid string) error {
 	// org := s.ctx.Get("org").(model.SysOrg)
 	cust := s.ctx.Get("customer").(model.TaCustomer)
 
@@ -48,7 +48,6 @@ func (s *GoodsServ) Orders(
 		// TODO
 	} else {
 		// 普通客户
-
 		account, err := s.custDAO.GetAccountByCust(info.UserId)
 		if err != nil {
 			utils.LogError("查询用户账户信息出错: " + err.Error())
@@ -56,39 +55,88 @@ func (s *GoodsServ) Orders(
 		}
 
 		// 如果是使用优惠券
-		if coupons != nil && len(coupons) > 0 {
+		if customercouponid != "" {
 			info.PayType = models.CONSUME_COUPON
-
-			// TODO
-			// 校验优惠券相关
-			// 优惠券默认抵消全部金额
-			info.ActualAmount = "0.0"
+			// 根据id获取优惠券信息
+			coupon, err := s.couponDAO.GetCouponInfoByCustomerCouponID(customercouponid)
+			if err != nil {
+				utils.LogError("查询优惠券信息失败: " + err.Error())
+				return errors.New("查询优惠券信息失败")
+			}
+			// 优惠券校验
+			// s.couponDAO.GetCustomerCouponByID
+			// 遍历优惠券可抵用的商品
+			var dyGoods = model.TaGoodsOrdersDetail{
+				Price:   "0.0",
+				GoodsId: "",
+			}
+			for _, detail := range details {
+				for _, target := range coupon.Targets {
+					if target.TargetId == detail.GoodsId {
+						dyprice, _ := strconv.ParseFloat(dyGoods.Price, 64)
+						detailprice, _ := strconv.ParseFloat(detail.Price, 64)
+						if dyprice < detailprice {
+							dyGoods = detail
+						}
+					}
+				}
+			}
+			if dyGoods.GoodsId != "" {
+				// 优惠券可以抵用商品
+				var ordersCoupon = model.TaGoodsOrdersCoupon{
+					OrdersId:   info.OrdersId,
+					OrdersNo:   info.OrdersNo,
+					CouponId:   coupon.CouponId,
+					CouponName: coupon.CouponName,
+					OrgId:      coupon.OrgId,
+					GoodsId:    dyGoods.GoodsId,
+					GoodsName:  dyGoods.GoodsName,
+					UsedAmount: dyGoods.Price,
+				}
+				if err := s.dao.SaveOrdersCoupon(&ordersCoupon, info); err != nil {
+					utils.LogError("保存优惠信息出错: " + err.Error())
+					return errors.New("保存优惠信息出错")
+				}
+				info.CouponAmount = dyGoods.Price
+				// info.ActualAmount = "0.0"
+
+				// 优惠券核销
+				err := s.couponDAO.VerifyCustomerCoupon(customercouponid)
+				if err != nil {
+					utils.LogError("优惠券核销出错: " + err.Error())
+					return errors.New("优惠券核销出错")
+				}
+			} else {
+				info.CouponAmount = "0.0"
+			}
 		} else {
 			// 如果是使用城币
 			info.PayType = models.CONSUME_COINCHG
-			accMoney, _ := strconv.ParseFloat(account.Amount, 64)
-			payMoney, _ := strconv.ParseFloat(info.Amount, 64)
-
-			if accMoney < payMoney {
-				return errors.New("账户余额不足")
-			}
+		}
 
-			info.ActualAmount = strconv.FormatFloat(payMoney, 'f', -1, 64)
+		accMoney, _ := strconv.ParseFloat(account.Amount, 64)
+		couponAmount, _ := strconv.ParseFloat(info.CouponAmount, 64)
+		payMoney, _ := strconv.ParseFloat(info.Amount, 64)
+		payMoney = payMoney - couponAmount
+		if accMoney < payMoney {
+			return errors.New("账户余额不足")
 		}
 
+		info.ActualAmount = strconv.FormatFloat(payMoney, 'f', -1, 64)
+
 		// 保存优惠券使用记录
-		if coupons != nil && len(coupons) > 0 {
-			if err := s.dao.SaveOrdersCoupon(coupons, info); err != nil {
-				utils.LogError("保存优惠信息出错: " + err.Error())
-				return errors.New("保存优惠信息出错")
-			}
+		// if coupons != nil && len(coupons) > 0 {
+		// 	if err := s.dao.SaveOrdersCoupon(coupons, info); err != nil {
+		// 		utils.LogError("保存优惠信息出错: " + err.Error())
+		// 		return errors.New("保存优惠信息出错")
+		// 	}
 
-			// TODO
-			// 核销优惠券
-		}
+		// TODO
+		// 核销优惠券
+		// }
 
 		// 如果是城币, 则插入用户账户消费记录
-		if info.PayType == models.CONSUME_COINCHG {
+		if payMoney > 0 {
 			if err := s.saveCustomerPayRec(account, info); err != nil {
 				return err
 			}

service/user.go

@@ -379,14 +379,14 @@ func (s *UserServ) SaveUserRole(userid, roleids string) error {
 }
 
 // GetUserCustomer 获取我的推荐客户
-func (s *UserServ) GetUserCustomer(userid, isrecommend string, page int, pageSize int) ([]model.TaCustomer, error) {
+func (s *UserServ) GetUserCustomer(userid, isrecommend, key string, page int, pageSize int) ([]model.TaCustomer, error) {
 	if pageSize == 0 {
 		pageSize = PAGENUM
 	}
 	if page == 0 {
 		page = 1
 	}
-	customers, err := s.dao.GetUserCustomer(userid, isrecommend, page, pageSize)
+	customers, err := s.dao.GetUserCustomer(userid, isrecommend, key, page, pageSize)
 	return customers, err
 }