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

.gitignore

@@ -1,4 +1,5 @@
 *.exe
 *.exe~
 *.test
-*.log
+*.log
+common.log

conf/app.conf

@@ -1,6 +1,6 @@
 appname = services
 httpport = 8080
-runmode = prod
+runmode = dev
 autorender = false
 copyrequestbody = true
 EnableDocs = true

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/auth.go

@@ -13,10 +13,10 @@ import (
 // 4、结束后，设置过期并从 Context 中删除
 // 5、生成新的 token， 并放入 Context 中
 func (c *BaseController) authenticate() {
-	serv := service.NewSysServ(c.Context)
+	c.serv = service.NewSysServ(c.Context)
 
 	// 鉴权 - 并初始化上下文
-	res := serv.AuthAndInitCtx(c.Ctx)
+	res := c.serv.AuthAndInitCtx(c.Ctx)
 
 	if res != nil {
 		code := http.StatusOK
@@ -32,26 +32,16 @@ func (c *BaseController) authenticate() {
 				data = res["message"].(map[string]interface{})
 			}
 
-			// 设置旧 token 过期
-			c.SetTokenExipre()
-
 			c.ResponseData(data, err, code)
 		}
 	}
-
-	// 设置旧 token 过期
-	c.SetTokenExipre()
-
-	// 生成新 token
-	c.CreateNewToken()
 }
 
 // SetTokenExipre 设置 token 过期
 func (c *BaseController) SetTokenExipre() {
 	token := c.Context.Get("token")
 	if token != nil {
-		serv := service.NewSysServ(c.Context)
-		serv.UpdateTokenExpire(token.(string))
+		c.serv.UpdateTokenExpire(token.(string))
 	}
 
 	c.Context.Set("token", "")
@@ -59,6 +49,5 @@ func (c *BaseController) SetTokenExipre() {
 
 // CreateNewToken 新 token
 func (c *BaseController) CreateNewToken() {
-	serv := service.NewSysServ(c.Context)
-	c.Context.Set("token", serv.NewToken())
+	c.Context.Set("token", c.serv.NewToken())
 }

controllers/base.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"net/http"
 	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
 
 	"github.com/astaxie/beego"
@@ -15,6 +16,7 @@ type BaseController struct {
 	Context  *utils.Context
 	Configer map[string]config.Configer
 	RunMode  string
+	serv     *service.SysServ
 }
 
 //Prepare 继承beego的
@@ -49,7 +51,6 @@ func (c *BaseController) ResponseError(err error, code ...int) {
 // ResponseData 自定义的JSON返回
 func (c *BaseController) ResponseData(data interface{}, msg interface{}, code int) {
 	status := code
-	c.destroyContext(status < http.StatusMultipleChoices)
 
 	sendMessage := ""
 	switch msgVal := msg.(type) {
@@ -64,14 +65,19 @@ func (c *BaseController) ResponseData(data interface{}, msg interface{}, code in
 	c.Data["json"] = JSONMessage{status, sendMessage, data}
 	c.Ctx.Output.Header("Access-Control-Expose-Headers", utils.TokenHeader)
 
-	token := c.Context.Get("token")
-	if token != nil {
-		tk := token.(string)
-		if tk != "" {
-			c.Ctx.Output.Header(utils.TokenHeader, utils.TokenSchema+" "+tk)
-		}
+	if status == http.StatusOK {
+		// 设置旧 token 过期
+		c.SetTokenExipre()
+
+		// 生成新 token
+		c.CreateNewToken()
+
+		token := c.Context.Get("token").(string)
+		c.Ctx.Output.Header(utils.TokenHeader, utils.TokenSchema+" "+token)
 	}
 
+	c.destroyContext(status < http.StatusMultipleChoices)
+
 	c.crosPolicy()
 	c.ServeJSON()
 	c.StopRun()

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,19 @@ func (c *CardController) GiveCard() {
 
 	c.ResponseJSON("ok")
 }
+
+// GetCardWithCustomer 获取卡及领取信息
+func (c *CardController) GetCardWithCustomer() {
+	cardid := c.GetString(":id")
+	cardDetail, err := c.serv.GetCardWithCustomer(cardid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(cardDetail)
+}
+
+// GetCardByCustomer 获取我的卡信息
+func (c *CardController) GetCardByCustomer() {
+	c.ResponseJSON("OK")
+}

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/course/order.go

@@ -16,21 +16,21 @@ func (c *CourseController) PostOrder() {
 	}
 
 	// 订单优惠券
-	coupons := c.GetString("coupons")
+	customercouponid := c.GetString("customercouponid")
 
 	//
 	var orderInfo model.TaCourseOrders
-	var orderCoupon []model.TaCourseOrdersCoupon
+	//	var orderCoupon []model.TaCourseOrdersCoupon
 
 	if err := json.Unmarshal([]byte(info), &orderInfo); err != nil {
 		utils.LogError("下单转换JSON失败: " + err.Error())
 		c.ResponseError(errors.New("下单数据格式不正确"))
 	}
 
-	if err := json.Unmarshal([]byte(coupons), &orderCoupon); err != nil {
-		utils.LogError("下单优惠转换JSON失败: " + err.Error())
-		c.ResponseError(errors.New("优惠数据格式不正确"))
-	}
+	// if err := json.Unmarshal([]byte(coupons), &orderCoupon); err != nil {
+	// 	utils.LogError("下单优惠转换JSON失败: " + err.Error())
+	// 	c.ResponseError(errors.New("优惠数据格式不正确"))
+	// }
 	cust := c.Context.Get("customer").(model.TaCustomer)
 
 	if cust.Phone == "" {
@@ -40,7 +40,7 @@ func (c *CourseController) PostOrder() {
 		)
 	}
 
-	if err := c.serv.Orders(&orderInfo, orderCoupon); err != nil {
+	if err := c.serv.Orders(&orderInfo, customercouponid); err != nil {
 		c.ResponseError(err)
 	}
 

controllers/file.go

@@ -50,9 +50,9 @@ func (c *BaseController) uploadFileToOSS(field string) (string, error) {
 }
 
 // SaveToExcel 保存文件到 excel
-func (c *BaseController) SaveToExcel(fn string, data interface{}, f func(interface{}) []interface{}) {
+func (c *BaseController) SaveToExcel(fn string, excel *utils.TinyXLSXEngine) {
 	var buf bytes.Buffer
-	if err := utils.NewTinyXLSXEngine().SetTransFunc(f).SetData(data).Write(&buf); err != nil {
+	if err := excel.Write(&buf); err != nil {
 		utils.LogError("写 xlsx buffer 失败: " + err.Error())
 		c.ResponseError(errors.New("生成 excel 异常, 请重试"))
 	}

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)
 	}
@@ -182,9 +183,8 @@ func (c *UserController) SignIn() {
 		)
 	}
 
-	// 成功之后, 生成新 token
+	// 成功之后, 设置用户
 	c.Context.Set("user", *user)
-	c.CreateNewToken()
 
 	if token == "" && doRemember != 0 {
 		var err error
@@ -206,8 +206,7 @@ func (c *UserController) SignIn() {
 
 // SignOut 用户登出
 func (c *UserController) SignOut() {
-	c.SetTokenExipre()
-	c.ResponseJSON("ok")
+	c.Context.Set("user", nil)
 }
 
 // GetEnvVars 获取当前用户相关

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,73 @@ 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(),
+		Status:           models.STATUS_READY,
+	}
+	var cols = []string{
+		"use_date",
+		"status",
+	}
+	_, 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/course/order.go

@@ -1,6 +1,8 @@
 package course
 
 import (
+	"errors"
+	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strings"
@@ -48,3 +50,17 @@ func (m *CourseDAO) SaveCourseOrderDetail(details []model.TaCourseOrdersDetail)
 	_, err := m.db.Insert(details)
 	return err
 }
+
+// SaveOrdersCoupon 保存订单优惠券
+func (m *CourseDAO) SaveOrdersCoupon(coupon *model.TaCourseOrdersCoupon, order *model.TaCourseOrders) error {
+	if order.OrdersId == "" {
+		return errors.New("内部错误, 订单事务顺序出错")
+	}
+	coupon.OrdersCouponId = utils.GetGUID()
+	coupon.Status = models.STATUS_NORMAL
+	coupon.CreateDate = time.Now().Local()
+	if _, err := m.db.Insert(coupon); err != nil {
+		return err
+	}
+	return nil
+}

models/goods/orders.go

@@ -73,42 +73,48 @@ 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(coupon *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 {
+	coupon.OrdersCouponId = utils.GetGUID()
+	coupon.Status = models.STATUS_NORMAL
+	coupon.CreateDate = time.Now().Local()
+	if _, err := m.db.Insert(coupon); 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

@@ -269,6 +269,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/course/course.go

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

service/course/order.go

@@ -15,7 +15,7 @@ import (
 // Orders 下单
 func (s *CourseServ) Orders(
 	couseOrder *model.TaCourseOrders,
-	coupons []model.TaCourseOrdersCoupon,
+	customercouponid string,
 ) error {
 	org := s.ctx.Get("org").(model.SysOrg)
 	cust := s.ctx.Get("customer").(model.TaCustomer)
@@ -47,11 +47,6 @@ func (s *CourseServ) Orders(
 		return errors.New("定单课程尚未排课, 不能下单")
 	}
 
-	if coupons != nil && len(coupons) > 0 {
-		// 校验卡券, 同时进行卡券的注销或者已使用的更新操作
-		// TODO
-	}
-
 	couseOrder.OrdersId = guid.NewGUIDString()
 	couseOrder.Price = course.Price // 课程价格, 即为订单价格
 	couseOrder.ActualAmount = course.Price
@@ -69,23 +64,91 @@ func (s *CourseServ) Orders(
 		couseOrder.CustomerName = cust.CustomerName
 	}
 
-	// 校验金额
-	if err := s.validBillCharges(couseOrder, coupons); err != nil {
-		return err
+	account, err := s.custDAO.GetAccountByCust(cust.CustomerId)
+	if err != nil {
+		utils.LogError("查询用户账户信息出错: " + err.Error())
+		return errors.New("查询用户账户信息出错")
 	}
+	accMoney, _ := strconv.ParseFloat(account.Amount, 64)
+
+	if customercouponid != "" {
+		// 校验卡券, 同时进行卡券的注销或者已使用的更新操作
+		// TODO
+		couseOrder.PayType = models.CONSUME_COUPON
+
+		// 优惠券校验
+		customerCoupon, err := s.couponDAO.GetCustomerCouponByID(customercouponid)
+		if err != nil {
+			utils.LogError("查询优惠券信息失败: " + err.Error())
+			return errors.New("查询优惠券信息失败")
+		}
+		if customerCoupon == nil || customerCoupon.CustomerCouponId == "" {
+			return errors.New("优惠券无效！")
+		}
+		if customerCoupon.Status != models.STATUS_NORMAL || !customerCoupon.UseDate.IsZero() {
+			return errors.New("优惠券已被使用！请重新选择优惠券！")
+		}
+
+		// 根据id获取优惠券信息
+		coupon, err := s.couponDAO.GetCouponInfoByCustomerCouponID(customercouponid)
+		if err != nil {
+			utils.LogError("查询优惠券信息失败: " + err.Error())
+			return errors.New("查询优惠券信息失败")
+		}
+
+		// 判断优惠券是否可以抵用商品
+		var isdy = false
+		if coupon.IsAll == 1 {
+			isdy = true
+			couseOrder.CouponAmount = couseOrder.Price
+		} else {
+			for _, target := range coupon.Targets {
+				if target.TargetId == course.CourseId {
+					isdy = true
+				}
+			}
+			couseOrder.CouponAmount = coupon.Price
+		}
+		if !isdy {
+			return errors.New("优惠券不可抵用该课程")
+		}
+		var ordersCoupon = model.TaCourseOrdersCoupon{
+			OrdersId:   couseOrder.OrdersId,
+			CouponId:   coupon.CouponId,
+			CouponName: coupon.CouponName,
+			UsedAmount: couseOrder.CouponAmount,
+		}
+		if err := s.dao.SaveOrdersCoupon(&ordersCoupon, couseOrder); err != nil {
+			utils.LogError("保存优惠信息出错: " + err.Error())
+			return errors.New("保存优惠信息出错")
+		}
+
+		// 优惠券核销
+		err = s.couponDAO.VerifyCustomerCoupon(customercouponid)
+		if err != nil {
+			utils.LogError("优惠券核销出错: " + err.Error())
+			return errors.New("优惠券核销出错")
+		}
+	} else {
+		couseOrder.PayType = models.CONSUME_COINCHG
+	}
+
+	couponAmount, _ := strconv.ParseFloat(couseOrder.CouponAmount, 64)
+	payMoney, _ := strconv.ParseFloat(couseOrder.Price, 64)
+	payMoney = payMoney - couponAmount
+
+	couseOrder.ActualAmount = strconv.FormatFloat(payMoney, 'f', -1, 64)
+
+	// 校验金额
+	// if err := s.validBillCharges(couseOrder, coupons); err != nil {
+	// 	return err
+	// }
 
 	// 实际支付
-	actualAmount, _ := strconv.ParseFloat(couseOrder.ActualAmount, 64)
+	actualAmount := payMoney
 
 	// 用户账户  -- 内部人员也可以购买
 	if actualAmount > 0 {
-		couseOrder.PayType = models.CONSUME_COINCHG
-		account, err := s.custDAO.GetAccountByCust(cust.CustomerId)
-		if err != nil {
-			utils.LogError("查询用户账户信息出错: " + err.Error())
-			return errors.New("查询用户账户信息出错")
-		}
-		accMoney, _ := strconv.ParseFloat(account.Amount, 64)
 
 		if actualAmount > accMoney {
 			return errors.New("账户余额不足")
@@ -99,7 +162,7 @@ func (s *CourseServ) Orders(
 	}
 
 	// 入库
-	if err := s.SaveOrder(couseOrder, coupons, course); err != nil {
+	if err := s.SaveOrder(couseOrder, course); err != nil {
 		utils.LogError("课程下单失败: " + err.Error())
 		return errors.New("下单失败, 请重试")
 	}
@@ -226,7 +289,7 @@ func (s *CourseServ) saveCustomerPayRec(account *model.TaCustomerAccount, info *
 }
 
 // SaveOrder 保存订单明细
-func (s *CourseServ) SaveOrder(order *model.TaCourseOrders, coupons []model.TaCourseOrdersCoupon, course *course.CourseDetail) error {
+func (s *CourseServ) SaveOrder(order *model.TaCourseOrders, course *course.CourseDetail) error {
 	// 订单信息
 	if err := s.dao.SaveCourseOrder(order); err != nil {
 		utils.LogError("课程下单失败: " + err.Error())
@@ -234,16 +297,16 @@ func (s *CourseServ) SaveOrder(order *model.TaCourseOrders, coupons []model.TaCo
 	}
 
 	// 默认城币购买
-	courseObtaimType := models.COURSE_GETBY_COINCHG
-	if coupons != nil && len(coupons) > 0 {
-		for _, c := range coupons {
-			if c.CouponType == models.COURSE_COUPON_CARD {
-				courseObtaimType = models.COURSE_GETBY_CARD
-			} else if c.CouponType == models.COURSE_COUPON_COUPON {
-				courseObtaimType = models.COURSE_GETBY_COUPON
-			}
-		}
-	}
+	// courseObtaimType := models.COURSE_GETBY_COINCHG
+	// if coupons != nil && len(coupons) > 0 {
+	// 	for _, c := range coupons {
+	// 		if c.CouponType == models.COURSE_COUPON_CARD {
+	// 			courseObtaimType = models.COURSE_GETBY_CARD
+	// 		} else if c.CouponType == models.COURSE_COUPON_COUPON {
+	// 			courseObtaimType = models.COURSE_GETBY_COUPON
+	// 		}
+	// 	}
+	// }
 
 	// 我的课程信息
 	custCourse := model.TaCustomerCourse{
@@ -257,7 +320,7 @@ func (s *CourseServ) SaveOrder(order *model.TaCourseOrders, coupons []model.TaCo
 		CourseNum:        course.CourseNum,
 		JoinNum:          0,
 		CreateDate:       time.Now().Local(),
-		CourseObtaimType: courseObtaimType,
+		CourseObtaimType: order.PayType,
 		SourceId:         order.OrdersId,
 		IsDone:           models.BOOL_FALSE,
 	}

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,108 @@ func (s *GoodsServ) Orders(
 		}
 
 		// 如果是使用优惠券
-		if coupons != nil && len(coupons) > 0 {
+		if customercouponid != "" {
 			info.PayType = models.CONSUME_COUPON
 
-			// TODO
-			// 校验优惠券相关
-			// 优惠券默认抵消全部金额
-			info.ActualAmount = "0.0"
+			// 优惠券校验
+			customerCoupon, err := s.couponDAO.GetCustomerCouponByID(customercouponid)
+			if err != nil {
+				utils.LogError("查询优惠券信息失败: " + err.Error())
+				return errors.New("查询优惠券信息失败")
+			}
+			if customerCoupon == nil || customerCoupon.CustomerCouponId == "" {
+				return errors.New("优惠券无效！")
+			}
+			if customerCoupon.Status != models.STATUS_NORMAL || !customerCoupon.UseDate.IsZero() {
+				return errors.New("优惠券已被使用！请重新选择优惠券！")
+			}
+
+			// 根据id获取优惠券信息
+			coupon, err := s.couponDAO.GetCouponInfoByCustomerCouponID(customercouponid)
+			if err != nil {
+				utils.LogError("查询优惠券信息失败: " + err.Error())
+				return errors.New("查询优惠券信息失败")
+			}
+			// 遍历优惠券可抵用的商品
+			var dyGoods = model.TaGoodsOrdersDetail{
+				Price:   "0.0",
+				GoodsId: "",
+			}
+			for _, detail := range details {
+				if coupon.IsAll == 1 {
+					dyprice, _ := strconv.ParseFloat(dyGoods.Price, 64)
+					detailprice, _ := strconv.ParseFloat(detail.Price, 64)
+					if dyprice < detailprice {
+						dyGoods = detail
+					}
+				} else {
+					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 {
+				return errors.New("优惠券不可抵用商品")
+			}
 		} 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/statistics/dashboard.go

@@ -1,37 +1,58 @@
 package statistics
 
-// import (
-// 	"spaceofcheng/services/models/model"
-// 	"spaceofcheng/services/utils"
-// 	"strings"
-// )
-
-// // StaDashboard 控制板统计
-// func (s *StatisticsServ) StaDashboard() error {
-// 	user := s.ctx.Get("user").(model.SysUser)
-
-// }
-
-// // distinctDashSettings 去重 dashboard 配置
-// func (s *StatisticsServ) distinctDashSettings(settings []model.TaDashboardSetting) []string {
-// 	comps := make([]string, 0)
-
-// 	if settings == nil || len(settings) == 0 {
-// 		return comps
-// 	}
-
-// 	for _, s := range settings {
-// 		comps = append(comps, s.CompList)
-// 	}
-
-// 	allComps := strings.Split(strings.Join(comps, ","), ",")
-
-// 	res := make([]string, 0)
-// 	for _, cmp := range allComps {
-// 		if utils.StrSliceIndexOf(res, cmp) == -1 {
-// 			res = append(res, cmp)
-// 		}
-// 	}
-
-// 	return res
-// }
+import (
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strings"
+)
+
+// StaDashboard 控制板统计
+func (s *StatisticsServ) StaDashboard() ([]map[string]interface{}, error) {
+	// user := s.ctx.Get("user").(model.SysUser)
+	// userTypes, err := s.dao.GetUserTypes(user.UserId)
+	// if err != nil {
+	// 	utils.LogError("获取用户类型失败: " + err.Error())
+	// 	return nil, errors.New("获取用户类型失败")
+	// }
+
+	// tps := make([]string, 0)
+	// if userTypes != nil {
+	// 	for _, tp := range userTypes {
+	// 		tps = append(tps, tp.TypeId)
+	// 	}
+	// }
+
+	// settings, err := s.dao.GetDashboardSetting(user.UserId, tps)
+	// if err != nil {
+	// 	utils.LogError("获取用户 Dashboard 配置失败: " + err.Error())
+	// 	return nil, errors.New("获取用户 Dashboard 配置失败")
+	// }
+
+	// comps := s.distinctDashSettings(settings)
+
+	return nil, nil
+}
+
+// distinctDashSettings 去重 dashboard 配置
+func (s *StatisticsServ) distinctDashSettings(settings []model.TaDashboardSetting) []string {
+	comps := make([]string, 0)
+
+	if settings == nil || len(settings) == 0 {
+		return comps
+	}
+
+	for _, s := range settings {
+		comps = append(comps, s.CompList)
+	}
+
+	allComps := strings.Split(strings.Join(comps, ","), ",")
+
+	res := make([]string, 0)
+	for _, cmp := range allComps {
+		if utils.StrSliceIndexOf(res, cmp) == -1 {
+			res = append(res, cmp)
+		}
+	}
+
+	return res
+}

service/statistics/setting.go

@@ -1,6 +1,13 @@
 package statistics
 
+const (
+	STA_TOTAL_CUSTOMER = "total-customer"
+	// STA_TOTAL_CUSTOMER = "total-customer"
+	// STA_TOTAL_CUSTOMER = "total-customer"
+	// STA_TOTAL_CUSTOMER = "total-customer"
+)
+
 // StaticMapFrontComponent 每种统计映射的前端组件名称
 var StaticMapFrontComponent = map[string]string{
-	"": "",
+	"total": "",
 }

service/sys.go

@@ -8,7 +8,6 @@ import (
 	"spaceofcheng/services/models/customer"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
-	"strconv"
 	"strings"
 	"time"
 
@@ -58,42 +57,15 @@ func (s *SysServ) AuthAndInitCtx(gctx *context.Context) map[string]interface{} {
 	// 客户端类型
 	// 通过 UA 判断
 	clientType := utils.GetClientType(gctx.Request)
-	if clientType == utils.ClientWechat {
-		// 初始化微信配置
-		if err := s.initWechatClient(s.org.OrgId); err != nil {
-			utils.LogError("初始化微信客户端失败: " + err.Error())
-
-			return map[string]interface{}{
-				"code":  http.StatusInternalServerError,
-				"error": errors.New("初始化微信客户端失败"),
-			}
-		}
-	}
-
-	// 获取 token
-	token, err := s.getToken(gctx, clientType)
-	if err != nil {
-		message := make(map[string]interface{})
-		if clientType == utils.ClientWechat {
-			message["appid"] = utils.GetWxAppID(s.org.OrgId)
-		}
-
-		// token 报错一律视为需要重新登录
-		return map[string]interface{}{
-			"code":    http.StatusUnauthorized,
-			"error":   err,
-			"message": message,
-		}
-	}
 
 	// pc 管理端
 	if clientType == utils.ClientAdmin {
-		return s.authPCAdmin(gctx, token)
+		return s.authPCAdmin(gctx)
 	}
 
 	// wechat 端
 	if clientType == utils.ClientWechat {
-		return s.authWechat(gctx, token)
+		return s.authWechat(gctx)
 	}
 
 	return map[string]interface{}{
@@ -150,11 +122,21 @@ func (s *SysServ) NewToken() string {
 
 // authPCAdmin
 // 管理端 API 校验
-func (s *SysServ) authPCAdmin(gctx *context.Context, token *utils.JWTToken) map[string]interface{} {
+func (s *SysServ) authPCAdmin(gctx *context.Context) map[string]interface{} {
 	if !s.needAuth(gctx) {
 		return nil
 	}
 
+	// 获取 token
+	token, err := s.getToken(gctx)
+	if err != nil {
+		// token 报错一律视为需要重新登录
+		return map[string]interface{}{
+			"code":  http.StatusUnauthorized,
+			"error": err,
+		}
+	}
+
 	if token.ID == "" || token.Guest == true {
 		return map[string]interface{}{
 			"code":  http.StatusUnauthorized,
@@ -172,20 +154,42 @@ func (s *SysServ) authPCAdmin(gctx *context.Context, token *utils.JWTToken) map[
 	return nil
 }
 
-func (s *SysServ) authWechat(gctx *context.Context, token *utils.JWTToken) map[string]interface{} {
-	// 微信 code
-	code := gctx.Input.Query("code")
-
+func (s *SysServ) authWechat(gctx *context.Context) map[string]interface{} {
 	var wxUser *utils.WechatUser
 	var openID string
 
-	// 未登录 或 未验证
-	if token.ID == "" {
-		// 微信用户信息
-		var err error
-		wxUser, err = s.wechartSignIn(gctx, code)
+	if beego.BConfig.RunMode == "dev" {
+		openID = "OPENID"
+	} else {
+		// 初始化微信配置
+		if err := s.initWechatClient(s.org.OrgId); err != nil {
+			utils.LogError("初始化微信客户端失败: " + err.Error())
+
+			return map[string]interface{}{
+				"code":  http.StatusInternalServerError,
+				"error": errors.New("初始化微信客户端失败"),
+			}
+		}
+
+		// 微信 code
+		code := gctx.Input.Query("code")
+
+		// 获取 token
+		token, err := s.getToken(gctx)
 		if err != nil {
-			if strings.Index(err.Error(), strconv.Itoa(http.StatusUnauthorized)) > -1 {
+			// token 报错一律视为需要重新登录
+			return map[string]interface{}{
+				"code":  http.StatusUnauthorized,
+				"error": err,
+				"message": map[string]interface{}{
+					"appid": utils.GetWxAppID(s.org.OrgId),
+				},
+			}
+		}
+
+		// 未登录 或 未验证
+		if token.ID == "" {
+			if code == "" {
 				return map[string]interface{}{
 					"code":  http.StatusUnauthorized,
 					"error": errors.New("请授权微信用户登录"),
@@ -195,22 +199,27 @@ func (s *SysServ) authWechat(gctx *context.Context, token *utils.JWTToken) map[s
 				}
 			}
 
-			return map[string]interface{}{
-				"code":  http.StatusInternalServerError,
-				"error": err,
+			// 微信用户信息
+			var err error
+			wxUser, err = s.wechartSignIn(gctx, code)
+			if err != nil {
+				return map[string]interface{}{
+					"code":  http.StatusInternalServerError,
+					"error": err,
+				}
 			}
-		}
 
-		if wxUser == nil {
-			return map[string]interface{}{
-				"code":  http.StatusInternalServerError,
-				"error": errors.New("请先关注公众号"),
+			if wxUser == nil {
+				return map[string]interface{}{
+					"code":  http.StatusInternalServerError,
+					"error": errors.New("请先关注公众号"),
+				}
 			}
-		}
 
-		openID = wxUser.OpenID
-	} else {
-		openID = token.ID
+			openID = wxUser.OpenID
+		} else {
+			openID = token.ID
+		}
 	}
 
 	// 查询数据库是否存在已有映射
@@ -310,16 +319,6 @@ func (s *SysServ) authWechat(gctx *context.Context, token *utils.JWTToken) map[s
 
 // wechartSignIn 使用 code 微信登录
 func (s *SysServ) wechartSignIn(gctx *context.Context, code string) (*utils.WechatUser, error) {
-	if beego.BConfig.RunMode == "dev" {
-		return &utils.WechatUser{
-			OpenID: "OPENID",
-		}, nil
-	}
-
-	if code == "" {
-		return nil, errors.New(strconv.Itoa(http.StatusUnauthorized))
-	}
-
 	// 获取 微信信息
 	// 可能出现的情况是 openid 获取到了, 但是详情没有获取到
 	wxUserMap, err := utils.WxClientFor(s.org.OrgId).GetUserInfo(code)
@@ -334,18 +333,7 @@ func (s *SysServ) wechartSignIn(gctx *context.Context, code string) (*utils.Wech
 	return utils.MapToWechatUser(wxUserMap), nil
 }
 
-func (s *SysServ) getToken(gctx *context.Context, clientType string) (*utils.JWTToken, error) {
-	if beego.BConfig.RunMode == "dev" {
-		id := "0"
-		if clientType == utils.ClientWechat {
-			id = "OPENID"
-		}
-
-		return &utils.JWTToken{
-			ID: id,
-		}, nil
-	}
-
+func (s *SysServ) getToken(gctx *context.Context) (*utils.JWTToken, error) {
 	tokenRaw := gctx.Input.Header(utils.TokenHeader)
 	if tokenRaw == "" {
 		return new(utils.JWTToken), nil

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
 }
 

utils/excel.go

@@ -1,8 +1,8 @@
 package utils
 
 import (
+	"errors"
 	"io"
-	"reflect"
 
 	"github.com/tealeg/xlsx"
 )
@@ -10,56 +10,33 @@ import (
 // TinyXLSXEngine 简版 xlsx 处理器
 type TinyXLSXEngine struct {
 	xlsxFile *xlsx.File
-	toSlice  func(interface{}) []interface{}
+	sheet    *xlsx.Sheet
 }
 
 // NewTinyXLSXEngine init
-func NewTinyXLSXEngine() *TinyXLSXEngine {
-	return &TinyXLSXEngine{}
-}
-
-// SetTransFunc 设置转换函数
-func (t *TinyXLSXEngine) SetTransFunc(f func(interface{}) []interface{}) *TinyXLSXEngine {
-	t.toSlice = f
-	return t
-}
-
-// SetData 设置数据
-func (t *TinyXLSXEngine) SetData(data interface{}) *TinyXLSXEngine {
+func NewTinyXLSXEngine() (*TinyXLSXEngine, error) {
 	file := xlsx.NewFile()
-	t.xlsxFile = file
 
 	sheet, err := file.AddSheet("sheet1")
 	if err != nil {
 		LogError("创建 xlsx sheet 失败: " + err.Error())
-		return t
-	}
-
-	if t.toSlice == nil {
-		t.toSlice = func(dt interface{}) []interface{} {
-			return nil
-		}
+		return nil, errors.New("创建 xlsx sheet 失败")
 	}
 
-	v := reflect.ValueOf(data)
-	if v.Kind() == reflect.Ptr {
-		v.Elem()
-	}
-
-	if v.Kind() == reflect.Slice && v.IsValid() {
-		l := v.Len()
-		for i := 0; i < l; i++ {
-			rowData := v.Index(i).Interface()
-			cols := t.toSlice(rowData)
+	return &TinyXLSXEngine{
+		xlsxFile: file,
+		sheet:    sheet,
+	}, nil
+}
 
-			row := sheet.AddRow()
-			for _, col := range cols {
-				row.AddCell().SetValue(col)
-			}
-		}
-	}
+// InsertRow 新增行
+func (t *TinyXLSXEngine) InsertRow() *xlsx.Row {
+	return t.sheet.AddRow()
+}
 
-	return t
+// SetCell 新增数据
+func (t *TinyXLSXEngine) SetCell(row *xlsx.Row, v interface{}) {
+	row.AddCell().SetValue(v)
 }
 
 // Write 写数据