bodycheck

conf/app.conf

@@ -1,10 +1,9 @@
 appname = services
 httpport = 8080
-runmode = dev
+runmode = prod
 autorender = false
 copyrequestbody = true
 EnableDocs = true
-sessionon = true
 excelpath = ./
 clienturl = http://dev.ycjcjy.com/c-v2
 

controllers/auth.go

@@ -1,205 +1,64 @@
 package controllers
 
 import (
-	"errors"
 	"net/http"
-	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service"
-	"spaceofcheng/services/utils"
-	"strings"
-
-	"github.com/astaxie/beego"
 )
 
 // Authenticate 权限验证
+// 其中 token 的处理方式是
+// 1、获取 request 中 token
+// 2、放入 Context 中
+// 3、校验 token
+// 4、结束后，设置过期并从 Context 中删除
+// 5、生成新的 token， 并放入 Context 中
 func (c *BaseController) authenticate() {
-
-	// 默认 service
 	serv := service.NewSysServ(c.Context)
 
-	orgID := c.GetString(":org")
-	if orgID == "" {
-		c.ResponseError(errors.New("接口地址访问不正确"))
-	}
-	serv.SetOrgByID(orgID)
-
-	// 客户端类型
-	clientType := utils.GetClientType(c.Ctx.Request)
-
-	switch clientType {
-	case utils.ClientAdmin:
-		c.authPCAdmin(serv)
-	case utils.ClientWechat:
-		c.authWechat(serv)
-	default:
-		c.ResponseError(
-			errors.New("暂不支持的 API 场景"),
-			http.StatusBadRequest,
-		)
-	}
-}
-
-// authPCAdmin PC管理端
-func (c *BaseController) authPCAdmin(serv *service.SysServ) {
-	if !c.needAuth() {
-		return
-	}
-
-	// 用户ID
-	userID := ""
-	userIDRaw := c.GetSession(SNUserID)
-	if userIDRaw != nil {
-		userID = userIDRaw.(string)
-	}
-
-	if userID == "" {
-		c.ResponseError(
-			errors.New("用户未登录"),
-			http.StatusUnauthorized,
-		)
-	}
-
-	if err := serv.SetUserProfile(userID); err != nil {
-		// utils.LogError(err.Error())
-
-		c.ResponseError(
-			utils.LogError(err.Error()),
-			http.StatusInternalServerError,
-		)
-	}
-
-	// 设置 Session
-	c.SetSession(SNUserID, userID)
-}
-
-// authWechat 微信端
-func (c *BaseController) authWechat(serv *service.SysServ) {
-	custID := ""
-	custIDRaw := c.GetSession(SNCustID)
-	if custIDRaw != nil {
-		custID = custIDRaw.(string)
-	}
+	// 鉴权 - 并初始化上下文
+	res := serv.AuthAndInitCtx(c.Ctx)
 
-	// 机构
-	org := c.Context.Get("org").(model.SysOrg)
-
-	// 微信配置
-	wxConf, err := serv.GetWeChatConfig(org.OrgId)
-	if err != nil {
-		utils.LogError("查询微信配置失败: " + err.Error())
-		c.ResponseError(
-			errors.New("没有找到微信相关配置"),
-			http.StatusBadRequest,
-		)
-	}
-	utils.WxClientSingleton(org.OrgId, wxConf)
-
-	// 用户微信信息
-	var wxDetail map[string]interface{}
-
-	detailRaw := c.GetSession("wechat_user")
-	if detailRaw != nil {
-		wxDetail = detailRaw.(map[string]interface{})
-	} else {
-		// DEV MODE
-		if c.RunMode == "dev" {
-			wxDetail = map[string]interface{}{
-				"openid":     "OPENID",
-				"nickname":   "NICKNAME",
-				"sex":        "1",
-				"province":   "PROVINCE",
-				"city":       "CITY",
-				"country":    "COUNTRY",
-				"headimgurl": "http://thirdwx.qlogo.cn/mmopen/g3MonUZtNHkdmzicIlibx6iaFqAc56vxLSUfpb6n5WKSYVY0ChQKkiaJSgQ1dZuTOgvLLrhJbERQQ4eMsv84eavHiaiceqxibJxCfHe/46",
-				"unionid":    "o6_bmasdasdsad6_2sgVt7hMZOPfL",
-			}
-		} else {
-			wxDetail = c.getWechatDetail(org.OrgId, serv)
+	if res != nil {
+		code := http.StatusOK
+		if res["code"] != nil {
+			code = res["code"].(int)
 		}
 
-		c.SetSession("wechat_user", wxDetail)
-	}
+		if code != http.StatusOK {
+			err := res["error"].(error)
+			data := map[string]interface{}{}
 
-	c.Context.Set("wxInfo", wxDetail)
+			if res["message"] != nil {
+				data = res["message"].(map[string]interface{})
+			}
 
-	// 用户映射检查
-	userMap, err := serv.CheckWechatUserMapping(wxDetail)
-	if err != nil {
-		c.ResponseError(
-			utils.LogError("获取人员映射账户失败: "+err.Error()),
-			http.StatusInternalServerError,
-		)
-	}
-	c.Context.Set("userMap", *userMap)
+			// 设置旧 token 过期
+			c.SetTokenExipre()
 
-	if !c.needAuth() {
-		return
-	}
-	// 未登录或者绑定, 返回 406
-	if custID == "" && userMap.UserId == "" {
-		// 新增用户信息
-		cust, err := serv.SaveNewCustomer(wxDetail, userMap)
-		if err != nil {
-			c.ResponseError(err)
+			c.ResponseData(data, err, code)
 		}
-		custID = cust.CustomerId
-		// c.ResponseError(
-		// 	errors.New("用户未登录或绑定"),
-		// 	http.StatusNotAcceptable,
-		// )
 	}
 
-	if custID == "" {
-		custID = userMap.UserId
-	}
-	if custID != "" {
-		if err := serv.SetCustomer(custID); err != nil {
-			utils.LogError(err.Error())
+	// 设置旧 token 过期
+	c.SetTokenExipre()
 
-			c.ResponseError(
-				errors.New("内部错误, 请重试"),
-				http.StatusInternalServerError,
-			)
-		}
-
-		// 设置 Session
-		c.SetSession(SNCustID, custID)
-	}
+	// 生成新 token
+	c.CreateNewToken()
 }
 
-func (c *BaseController) needAuth() bool {
-	route := c.Ctx.Input.URL()
-	apiPrefix := beego.AppConfig.String("api::prefix")
-	guestAPI := beego.AppConfig.String("api::guest")
-
-	if strings.Index(route, apiPrefix+strings.Split(guestAPI, ":")[0]) > -1 {
-		return false
+// SetTokenExipre 设置 token 过期
+func (c *BaseController) SetTokenExipre() {
+	token := c.Context.Get("token")
+	if token != nil {
+		serv := service.NewSysServ(c.Context)
+		serv.UpdateTokenExpire(token.(string))
 	}
 
-	return true
+	c.Context.Set("token", "")
 }
 
-// getWechatDetail 获取微信个人信息详情
-func (c *BaseController) getWechatDetail(org string, serv *service.SysServ) map[string]interface{} {
-	// 微信 code
-	code := c.GetString("code")
-	if code == "" {
-		c.ResponseData(
-			map[string]interface{}{
-				"appid": utils.GetWxAppID(org),
-			},
-			errors.New("获取微信信息失败"),
-			http.StatusUnauthorized,
-		)
-	}
-
-	usr, err := utils.WxClientFor(org).GetUserInfo(code)
-	if err != nil {
-		c.ResponseError(
-			utils.LogError("获取微信个人信息失败: "+err.Error()),
-			http.StatusInternalServerError,
-		)
-	}
-
-	return usr
+// CreateNewToken 新 token
+func (c *BaseController) CreateNewToken() {
+	serv := service.NewSysServ(c.Context)
+	c.Context.Set("token", serv.NewToken())
 }

controllers/base.go

@@ -62,7 +62,15 @@ 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", "X-Token")
+	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)
+		}
+	}
 
 	c.crosPolicy()
 	c.ServeJSON()

controllers/cases/signin.go

@@ -42,3 +42,25 @@ func (c *SigninController) GetSigninWhere() {
 
 	c.ResponseJSON(res)
 }
+
+// AddSignin 存入签到记录
+func (c *SigninController) AddSignin() {
+	phone := c.GetString("phone");
+	openId := c.GetString("openId")
+	caseId := c.GetString("caseId")
+	activityId := c.GetString("activityId")
+
+	signin := model.TaCheckinRecord{}
+	signin.Phone = phone
+	signin.OpenId = openId
+
+	userMapping := c.Context.Get("userMap").(model.TaUserMapping)
+
+	res,err := c.dao.AddSignin(signin,caseId,activityId,&userMapping)
+
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(res)
+}
+

controllers/context.go

@@ -12,7 +12,6 @@ import (
 * user					SysUser 									用户基本信息
 * customer			TaCustomer 								会员基本信息
 * userMap				TaUserMapping 						用户/会员 映射第三方账户
-* wxInfo				map[string]interface{} 		微信信息
 * cases					[]SysUserCase 						用户所有案场信息
 * currentCase		SysUserCase 							当前案场
 * org						SysOrg 										用户当前组织

controllers/coupon/coupon.go

@@ -167,3 +167,25 @@ func (c *CouponController) GiveCoupon() {
 
 	c.ResponseJSON("ok")
 }
+
+// GetCouponBySendType 根据类型获取优惠券
+func (c *CouponController) GetCouponBySendType() {
+	sendtype := c.GetString(":type")
+	coupons, err := c.serv.GetCouponBySendType(sendtype)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(coupons)
+}
+
+// GetCouponWithCustomer 获取优惠券领取信息
+func (c *CouponController) GetCouponWithCustomer() {
+	couponid := c.GetString(":id")
+	couponDetail, err := c.serv.GetCouponWithCustomer(couponid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(couponDetail)
+}

controllers/file.go

@@ -1,12 +1,14 @@
 package controllers
 
 import (
+	"bytes"
 	"errors"
 	"spaceofcheng/services/utils"
 	"strconv"
 	"time"
 
 	"net/http"
+	"net/url"
 )
 
 // FileUpload 文件上传
@@ -46,3 +48,24 @@ func (c *BaseController) uploadFileToOSS(field string) (string, error) {
 
 	return fileURL, nil
 }
+
+// SaveToExcel 保存文件到 excel
+func (c *BaseController) SaveToExcel(fn string, data interface{}, f func(interface{}) []interface{}) {
+	var buf bytes.Buffer
+	if err := utils.NewTinyXLSXEngine().SetTransFunc(f).SetData(data).Write(&buf); err != nil {
+		utils.LogError("写 xlsx buffer 失败: " + err.Error())
+		c.ResponseError(errors.New("生成 excel 异常, 请重试"))
+	}
+
+	c.Ctx.Output.Header("Content-Disposition", "attachment; filename="+url.QueryEscape(fn))
+	c.Ctx.Output.Header("Content-Description", "File Transfer")
+	c.Ctx.Output.ContentType(".xlsx")
+	c.Ctx.Output.Header("Content-Transfer-Encoding", "binary")
+	c.Ctx.Output.Header("Expires", "0")
+	c.Ctx.Output.Header("Cache-Control", "must-revalidate")
+	c.Ctx.Output.Header("Pragma", "public")
+
+	r := bytes.NewReader(buf.Bytes())
+	http.ServeContent(c.Ctx.ResponseWriter, c.Ctx.Request, fn, time.Now().Local(), r)
+	c.StopRun()
+}

controllers/marketing/marketing.go

@@ -23,7 +23,7 @@ func (c *MarketingController) Constructor() {
 // 获取 营销活动列表
 func (c *MarketingController) GetMarketingList(){
 	page, _ := c.GetInt("page")
-	pageSize, _ := c.GetInt("pagesize")
+	pageSize, _ := c.GetInt("pageSize")
 
 	marketings, err := c.serv.GetMarketingList(page,pageSize)
 	if err != nil {
@@ -36,17 +36,19 @@ func (c *MarketingController) GetMarketingList(){
 // SaveMarketing 保存营销活动
 func (c *MarketingController) SaveMarketing() {
 	marketing := model.SysActivity{}
-
+	// 机构
+	//org := c.Context.Get("org").([]model.SysOrg)
 	// 获取值
 	activityName := c.GetString("activityName")
 	activityType := c.GetString("activityType")
 	resourceDesc := c.GetString("resourceDesc") // 活动描述
+	caseId := c.GetString("CaseId")
 
 	// 赋值
 	marketing.ActivityName = activityName
 	marketing.ActivityType = activityType
 
-	newInfo,_, err := c.serv.SaveMarketing(marketing,resourceDesc)
+	newInfo,_, err := c.serv.SaveMarketing(marketing,resourceDesc,caseId)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -88,7 +90,7 @@ func (c *MarketingController) UpdateMarketing(){
 
 // DelMarketing 删除
 func (c *MarketingController) DelMarketing(){
-	activityId := c.GetString("activityId")
+	activityId := c.GetString(":activityId")
 	err := c.serv.DelMarketing(activityId)
 	if err != nil {
 		c.ResponseError(err)
@@ -98,7 +100,7 @@ func (c *MarketingController) DelMarketing(){
 
 // DelMarketing 正常
 func (c *MarketingController) DelMarketingNormal(){
-	activityId := c.GetString("activityId")
+	activityId := c.GetString(":activityId")
 	err := c.serv.DelMarketingNormal(activityId)
 	if err != nil {
 		c.ResponseError(err)
@@ -108,7 +110,7 @@ func (c *MarketingController) DelMarketingNormal(){
 
 // DelMarketing 停用
 func (c *MarketingController) DelMarketingDisable(){
-	activityId := c.GetString("activityId")
+	activityId := c.GetString(":activityId")
 	err := c.serv.DelMarketingDisable(activityId)
 	if err != nil {
 		c.ResponseError(err)

controllers/user/user.go

@@ -182,8 +182,9 @@ func (c *UserController) SignIn() {
 		)
 	}
 
-	// 成功之后, 设置 session
-	c.SetSession(controllers.SNUserID, user.UserId)
+	// 成功之后, 生成新 token
+	c.Context.Set("user", *user)
+	c.CreateNewToken()
 
 	if token == "" && doRemember != 0 {
 		var err error
@@ -205,7 +206,7 @@ func (c *UserController) SignIn() {
 
 // SignOut 用户登出
 func (c *UserController) SignOut() {
-	c.DestroySession()
+	c.SetTokenExipre()
 	c.ResponseJSON("ok")
 }
 
@@ -251,11 +252,11 @@ func (c *UserController) GetUserByTel() {
 
 // GetForbidUsers 获取所有禁止人员信息
 func (c *UserController) GetForbidUsers() {
-	caseid := c.GetString("caseid")
-	if caseid == "" {
-		c.ResponseError(errors.New("没有案场信息"))
-	}
-	users, err := c.dao.GetForbidUsers(caseid)
+	// caseid := c.GetString("caseid")
+	// if caseid == "" {
+	// 	c.ResponseError(errors.New("没有案场信息"))
+	// }
+	users, err := c.dao.GetForbidUsers()
 	if err != nil {
 		utils.LogError("获取禁止人员信息失败: " + err.Error())
 		c.ResponseError(errors.New("获取禁止人员信息失败"))
@@ -286,3 +287,25 @@ func (c *UserController) OpenForbidUser() {
 	}
 	c.ResponseJSON("操作成功")
 }
+
+// GetCaseUserByType 根据用户类型获取用户信息
+func (c *UserController) GetCaseUserByType() {
+	usertype := c.GetString(":type")
+	users, err := c.dao.GetCaseUserByType(usertype)
+	if err != nil {
+		utils.LogError("获取人员信息失败: " + err.Error())
+		c.ResponseError(errors.New("获取人员信息失败"))
+	}
+	c.ResponseJSON(users)
+}
+
+// GetCaseUserByID 根据id获取用户详情
+func (c *UserController) GetCaseUserByID() {
+	userid := c.GetString(":id")
+	userdetail, err := c.dao.GetCaseUserByUserID(userid)
+	if err != nil {
+		utils.LogError("获取人员信息失败: " + err.Error())
+		c.ResponseError(errors.New("获取人员信息失败"))
+	}
+	c.ResponseJSON(userdetail)
+}

models/card/card.go

@@ -215,15 +215,62 @@ func (m *CardDAO) CheckCustCard(custID, CardID string, startDate, endDate time.T
 // 案场可用卡信息
 type CaseUsableCard struct {
 	model.TaCouponCard `xorm:"extends"`
-	UserSendCount      int
-	UserUsedCount      int
+	CustomerCard       []model.TaCustomerCard
 }
 
 // GetCaseUsableCard 获取案场可用卡信息
-func (m *CardDAO) GetCaseUsableCard(caseid string) ([]CaseUsableCard, error) {
+func (m *CardDAO) GetCaseUsableCard(caseid, userid string, page, pageSize int) ([]CaseUsableCard, error) {
 	var cards []CaseUsableCard
-	sql := `select * from ta_coupon_card where case_id=? and status=? and end_date>now() order by create_date limit `
-	err := m.db.Sql(sql).Find(&cards)
-	// err := m.db.Where("case_id=?", caseid).And("status=?", models.STATUS_NORMAL).And("end_date>now()").Desc("create_date").Find(&cards)
+	sql := `select * from ta_coupon_card where case_id=? and status=? and end_date>now() order by create_date limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL).Find(&cards)
+	if userid != "" {
+		for inx, card := range cards {
+			cCards, err := m.GetCustomerCardByCardAndUser(card.CardId, userid)
+			if err != nil {
+				return nil, err
+			}
+			cards[inx].CustomerCard = cCards
+		}
+	}
 	return cards, err
 }
+
+// GetCustomerCardByCardAndUser 根据卡与用户获取领取的用户信息
+func (m *CardDAO) GetCustomerCardByCardAndUser(cardid, userid string) ([]model.TaCustomerCard, error) {
+	var customerCards []model.TaCustomerCard
+	err := m.db.Where("card_id=?", cardid).And("sales_id=?", userid).And("status>?", models.STATUS_DEL).Find(&customerCards)
+	return customerCards, err
+}
+
+// GetCardDetail 获取卡详情
+func (m *CardDAO) GetCardDetail(cardid string) (*CaseUsableCard, error) {
+	var card = new(CaseUsableCard)
+	sql := `select * from ta_coupon_card where card_id=? and status>?`
+	_, err := m.db.Sql(sql, cardid, models.STATUS_DEL).Get(&card)
+	if err != nil {
+		return nil, err
+	}
+	if card == nil || card.CardId == "" {
+		return nil, errors.New("无卡信息")
+	}
+	ccards, err := m.GetCustomerCardByCard(cardid)
+	if err != nil {
+		return nil, err
+	}
+	card.CustomerCard = ccards
+	return card, nil
+}
+
+// GetCustomerCardByCard 根据卡获取领取的用户信息
+func (m *CardDAO) GetCustomerCardByCard(cardid string) ([]model.TaCustomerCard, error) {
+	var customerCards []model.TaCustomerCard
+	err := m.db.Where("card_id=?", cardid).And("status>?", models.STATUS_DEL).Find(&customerCards)
+	return customerCards, err
+}
+
+// GetCustomerCardByUser 根据用户获取发送的卡信息
+func (m *CardDAO) GetCustomerCardByUser(caseid, userid string) ([]model.TaCustomerCard, error) {
+	var customerCards []model.TaCustomerCard
+	err := m.db.Where("case_id=?", caseid).And("sales_id=?", userid).And("status>?", models.STATUS_DEL).Find(&customerCards)
+	return customerCards, err
+}

models/cases/signin.go

@@ -3,9 +3,10 @@ package cases
 import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"spaceofcheng/services/models"
 	"strconv"
 	"strings"
-
+	"time"
 	"github.com/go-xorm/xorm"
 )
 
@@ -43,10 +44,10 @@ func NewSigninDAO(ctx *utils.Context) *SigninDAO {
 	}
 }
 
-// CaseInfo 案场
+// SigninInfo 案场
 type SigninInfo struct {
 	model.TaCheckinRecord `xorm:"extends"`
-	//CreateUserName string
+	UserId string
 }
 
 /**
@@ -95,3 +96,12 @@ func (m *SigninDAO) GetSigninWhere(selectType int, caseid string, page, pageSize
 	// }
 	return signin, err
 }
+
+// AddSignin 添加签到记录 
+func (m *SigninDAO) AddSignin(signin model.TaCheckinRecord)(model.TaCheckinRecord,error){
+	signin.CheckinId = utils.GetGUID()
+	signin.CreateDate = time.Now()
+	signin.Status = models.STATUS_NORMAL
+	_,err := m.db.Insert(signin)
+	return signin,err
+}

models/constant.go

@@ -139,6 +139,12 @@ const (
 	SYS_RESOURCE_GOODS  = "goods"
 )
 
+// dashboard 配置的使用者类型
+const (
+	DASH_SETTING_FOR_USER     = "user"
+	DASH_SETTING_FOR_USERTYPE = "user-type"
+)
+
 // 卡券状态
 const (
 	CARD_COUPON_RECEIVED = "received"

models/coupon/coupon.go

@@ -251,3 +251,88 @@ func (m *CouponDAO) SaveCouponRecoreds(recs []model.TaCouponGiveRecord) error {
 
 	return nil
 }
+
+// GetCouponBySendType 根据类型获取优惠券
+func (m *CouponDAO) GetCouponBySendType(caseids, sendtype string) ([]model.TaCoupon, error) {
+	var coupons []model.TaCoupon
+	err := m.db.Where("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").And("send_type=?", sendtype).And("status=?", models.STATUS_NORMAL).Find(&coupons)
+	return coupons, err
+}
+
+// GetCaseUsableCoupon 获取案场可用优惠券信息
+func (m *CouponDAO) GetCaseUsableCoupon(caseid, userid string, page, pageSize int) ([]CaseCouponDetail, error) {
+	var Coupons []CaseCouponDetail
+	sql := `select * from ta_coupon where case_id=? and status=? and end_date>now() order by create_date limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL).Find(&Coupons)
+	if userid != "" {
+		for inx, Coupon := range Coupons {
+			cCoupons, err := m.GetCustomerCouponByCouponAndUser(Coupon.CouponId, userid)
+			if err != nil {
+				return nil, err
+			}
+			Coupons[inx].CustomerCoupon = cCoupons
+		}
+	}
+	return Coupons, err
+}
+
+// GetCustomerCouponByCouponAndUser 根据优惠券与用户获取领取的用户信息
+func (m *CouponDAO) GetCustomerCouponByCouponAndUser(couponid, userid string) ([]model.TaCustomerCoupon, error) {
+	var customerCoupons []model.TaCustomerCoupon
+	err := m.db.Where("coupon_id=?", couponid).And("sales_id=?", userid).And("status>?", models.STATUS_DEL).Find(&customerCoupons)
+	return customerCoupons, err
+}
+
+// GetCouponDetail 获取优惠券详情
+func (m *CouponDAO) GetCouponDetail(couponid string) (*CaseCouponDetail, error) {
+	var coupon = new(CaseCouponDetail)
+	sql := `select * from ta_coupon_Coupon where coupon_id=? and status>?`
+	_, err := m.db.Sql(sql, couponid, models.STATUS_DEL).Get(&coupon)
+	if err != nil {
+		return nil, err
+	}
+	if coupon == nil || coupon.CouponId == "" {
+		return nil, errors.New("无优惠券信息")
+	}
+	cCoupons, err := m.GetCustomerCouponByCoupon(couponid)
+	if err != nil {
+		return nil, err
+	}
+	coupon.CustomerCoupon = cCoupons
+	return coupon, nil
+}
+
+// GetCustomerCouponByCoupon 根据优惠券获取领取的用户信息
+func (m *CouponDAO) GetCustomerCouponByCoupon(couponid string) ([]model.TaCustomerCoupon, error) {
+	var customerCoupons []model.TaCustomerCoupon
+	err := m.db.Where("coupon_id=?", couponid).And("status>?", models.STATUS_DEL).Find(&customerCoupons)
+	return customerCoupons, err
+}
+
+// GetCustomerCouponByUser 根据用户获取领取的用户信息
+func (m *CouponDAO) GetCustomerCouponByUser(caseid, userid string) ([]model.TaCustomerCoupon, error) {
+	var customerCoupons []model.TaCustomerCoupon
+	err := m.db.Where("case_id=?", caseid).And("sales_id=?", userid).And("status>?", models.STATUS_DEL).Find(&customerCoupons)
+	return customerCoupons, err
+}
+
+// GetCouponWithCustomer 获取优惠券明细
+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)
+	if err != nil {
+		return nil, err
+	}
+	if coupon == nil || coupon.CouponId == "" {
+		return nil, errors.New("无优惠券信息")
+	}
+	var customerCopons []model.TaCustomerCoupon
+	sql = `select * from ta_customer_coupon where coupon_id = ? and status>?`
+	err = m.db.Sql(sql, coupon, models.STATUS_DEL).Find(&customerCopons)
+	if err != nil {
+		return nil, err
+	}
+	coupon.CustomerCoupon = customerCopons
+	return coupon, nil
+}

models/coupon/types.go

@@ -18,3 +18,9 @@ type CouponInfo struct {
 	Images         []model.TaCouponImage
 	Rules          []model.TaCouponRule
 }
+
+// CaseUsableCoupon 案场可用优惠券信息
+type CaseCouponDetail struct {
+	model.TaCoupon `xorm:"extends"`
+	CustomerCoupon []model.TaCustomerCoupon
+}

models/goods/orders.go

@@ -262,3 +262,15 @@ func (m *GoodsDAO) UpdateOrdersMake(orders model.TaGoodsOrders) error {
 	_, err := m.db.Cols(cols...).Where("orders_id=?", orders.OrdersId).Update(orders)
 	return err
 }
+
+// GetOrderDetailByUser 获取用户所有下单信息
+func (m *GoodsDAO) GetOrderDetailByUser(caseid, userid string) ([]model.TaGoodsOrdersDetail, error) {
+	var details []model.TaGoodsOrdersDetail
+	sql := `select a.* from ta_goods_orders_detail a inner join ta_goods_orders b on a.orders_id=b.orders_id
+		inner join ta_customer c on b.user_id = c.customer_id
+	where c.user_id=? and b.status>? and b.case_id=?`
+	if err := m.db.Sql(sql, userid, models.STATUS_DEL, caseid).Find(&details); err != nil {
+		return nil, err
+	}
+	return details, nil
+}

models/marketing/marketing.go

@@ -10,7 +10,7 @@ import(
 
 // 活动类型
 const (
-	NEW_ACTIVITIES = 0 // 注册赠券
+	NEW_ACTIVITIES = 1 // 注册赠券
 
 )
 
@@ -19,7 +19,6 @@ const (
 	DELETE = -1 // 删除
 	NORMAL = 0 // 正常
 	DISABLE = 1 // 停用
-
 )
 
 // 赠券卡券
@@ -43,9 +42,14 @@ func NewMarketingDAO(ctx *utils.Context) *MarketingDAO {
 	}
 }
 
-// MarketingInfo 课程
+// MarketingInfo 
 type MarketingInfo struct {
 	model.SysActivity `xorm:"extends"`
+	CaseName		 string
+	ActionId     string
+	ActiveType  string
+	ResourceType string
+	ResourceDesc string
 	Actions []model.SysActivityAction
 }
 
@@ -53,7 +57,9 @@ type MarketingInfo struct {
 func (m *MarketingDAO) GetMarketingList(page int, pageSize int) ([]MarketingInfo ,error){
 
 	var news []MarketingInfo
-	sql := `select * from sys_activity new order by new.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
+	//sql := `select * from sys_activity new order by new.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
+	sql :=`SELECT sc.case_name,sa.*,sas.action_id,sas.active_type,sas.resource_type,sas.resource_desc from sys_activity sa LEFT JOIN sys_activity_action sas on sa.activity_id = sas.activity_id LEFT JOIN sys_case sc on sa.case_id = sc.case_id where sa.status != -1 order by sa.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
+
 	err := m.db.Sql(sql).Find(&news)
 	return news, err
 
@@ -72,24 +78,18 @@ func (m *MarketingDAO) GetMarketingCount()(int64, error){
 
 
 // AddMarketing 添加
-func (m *MarketingDAO) AddMarketing(activity *model.SysActivity) (*model.SysActivity, error) {
+func (m *MarketingDAO) AddMarketing(activity model.SysActivity, caseId string) (*model.SysActivity, error) {
 	activity.ActivityId = utils.GetGUID()
 	activity.CreateDate = time.Now()
 	//activity.Status = models.STATUS_NORMAL
 	activity.Status = NORMAL // 状态为正常
 	org := m.ctx.Get("org").(model.SysOrg)
 	activity.OrgId = org.OrgId
-	caseinfo := m.ctx.Get("currentCase").(model.SysCase)
-	activity.CaseId = caseinfo.CaseId
-	//activity.CaseId = user.
+	activity.CaseId = caseId
 
-	_, err := m.db.Insert(activity)
+	_, err := m.db.Insert(&activity)
 
-	// // 添加活动动作数据
-	// var new model.SysActivityAction
-	// new.ActionId = activity.ActivityId
-	// new.ActiveType = activity.ActivityType
-	return activity, err
+	return &activity, err
 }
 
 

models/marketing/work.go

@@ -27,11 +27,12 @@ type WrokInfo struct {
 }
 
 // 添加 活动动作
-func (m *WorkDAO) AddWork(action *model.SysActivityAction) (*model.SysActivityAction,error){
+func (m *WorkDAO) AddWork(action model.SysActivityAction) (*model.SysActivityAction,error){
 	action.ActionId = utils.GetGUID()
+	println("service: 主键:" + action.ActionId + "活动ID"+action.ActivityId+" 活动类型-"+action.ActiveType+" 资源描述-"+action.ResourceDesc+" 资源类型-"+	action.ResourceType)
 	_,err := m.db.Insert(&action)
 
-	return action,err
+	return &action,err
 
 }
 

models/model/sys_activity.go

@@ -1,15 +1,15 @@
-package model
-
-import (
-	"time"
-)
-
-type SysActivity struct {
-	ActivityId   string    `xorm:"not null pk VARCHAR(64)"`
-	ActivityName string    `xorm:"VARCHAR(50)"`
-	ActivityType string    `xorm:"VARCHAR(64)"`
-	OrgId        string    `xorm:"VARCHAR(64)"`
-	CaseId       string    `xorm:"VARCHAR(64)"`
-	Status       int       `xorm:"SMALLINT(6)"`
-	CreateDate   time.Time `xorm:"DATETIME"`
-}
+package model
+
+import (
+	"time"
+)
+
+type SysActivity struct {
+	ActivityId   string    `xorm:"not null pk VARCHAR(64)"`
+	ActivityName string    `xorm:"VARCHAR(50)"`
+	ActivityType string    `xorm:"VARCHAR(64)"`
+	OrgId        string    `xorm:"VARCHAR(64)"`
+	CaseId       string    `xorm:"VARCHAR(64)"`
+	Status       int       `xorm:"SMALLINT(6)"`
+	CreateDate   time.Time `xorm:"DATETIME"`
+}

models/model/sys_token_log.go

@@ -0,0 +1,10 @@
+package model
+
+import "time"
+
+type SysTokenLog struct {
+	TokenId    int       `xorm:"not null pk autoincr INT(11)"`
+	Token      string    `xorm:"TEXT"`
+	Status     int       `xorm:"SMALLINT(6)"`
+	CreateDate time.Time `xorm:"DATETIME"`
+}

models/model/ta_dashboard_setting.go

@@ -0,0 +1,10 @@
+package model
+
+type TaDashboardSetting struct {
+	SettingId   string `xorm:"not null pk VARCHAR(64)"`
+	SettingName string `xorm:"VARCHAR(255)"`
+	CompList    string `xorm:"TEXT"`
+	Owner       string `xorm:"VARCHAR(64)"`
+	ForType     string `xorm:"VARCHAR(100)"`
+	Status      int    `xorm:"SMALLINT(6)"`
+}

models/statistics/other.go

@@ -0,0 +1,45 @@
+package statistics
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"strings"
+)
+
+// GetUserTypes 获取人员类型
+func (m *StatisticsDAO) GetUserTypes(id string) ([]model.SysUserType, error) {
+	if id == "" {
+		return nil, nil
+	}
+
+	var tps []model.SysUserType
+	if err := m.db.Where("user_id=?", id).Find(&tps); err != nil {
+		return nil, err
+	}
+
+	return tps, nil
+}
+
+// GetDashboardSetting 获取人员 dashboard 设置
+func (m *StatisticsDAO) GetDashboardSetting(userID string, userTypes []string) ([]model.TaDashboardSetting, error) {
+	filters := make([]string, 0)
+	if userID != "" {
+		filters = append(filters, "(for_type='"+models.DASH_SETTING_FOR_USER+"' AND owner='"+userID+"')")
+	}
+
+	if userTypes != nil {
+		filters = append(filters, "(for_type='"+models.DASH_SETTING_FOR_USERTYPE+"' AND owner in ('"+strings.Join(userTypes, "','")+"'))")
+	}
+
+	if len(filters) == 0 {
+		return nil, nil
+	}
+
+	var settings []model.TaDashboardSetting
+	query := `select * from ta_dashboard_setting where (` + strings.Join(filters, " OR ") + ") AND status = ?"
+	if err := m.db.SQL(query, models.STATUS_NORMAL).Find(&settings); err != nil {
+		return nil, err
+	}
+
+	return settings, nil
+}

models/sys.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"time"
 
 	"github.com/yl10/kit/guid"
 
@@ -165,3 +166,42 @@ func (m *SysDAO) GetWeChatConfig(org string) (*model.SysWechatConf, error) {
 
 	return conf, nil
 }
+
+// InsertToken 插入 token 生成记录
+func (m *SysDAO) InsertToken(token string) error {
+	tk := model.SysTokenLog{
+		Token:      token,
+		Status:     STATUS_NORMAL,
+		CreateDate: time.Now().Local(),
+	}
+
+	if _, err := m.db.Insert(&tk); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// UpdateTokenExpire 设置 token 过期
+func (m *SysDAO) UpdateTokenExpire(token string) error {
+	tk := model.SysTokenLog{
+		Status: STATUS_DEL,
+	}
+
+	if _, err := m.db.Cols("status").Where("token=?", token).Update(&tk); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// GetToken 获取 token
+func (m *SysDAO) GetToken(token string) (*model.SysTokenLog, error) {
+	tk := model.SysTokenLog{}
+
+	if _, err := m.db.Where("token=?", token).Get(&tk); err != nil {
+		return nil, err
+	}
+
+	return &tk, nil
+}

models/system/user.go

@@ -465,7 +465,7 @@ func (m *UserDAO) CheckUserName(userid, username, orgid string) (bool, error) {
 // GetForbidUsers 获取所有禁止人员信息
 func (m *UserDAO) GetForbidUsers(caseid string) ([]model.TaForbidUser, error) {
 	var forbiduser []model.TaForbidUser
-	err := m.db.Where("case_id=?", caseid).And("end_date > NOW()").And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&forbiduser)
+	err := m.db.Where("case_id=?", caseid).And("(end_date is null or end_date > NOW())").And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&forbiduser)
 	return forbiduser, err
 }
 
@@ -496,3 +496,29 @@ func (m *UserDAO) OpenForbidUser(forbid *model.TaForbidUser) error {
 	_, err := m.db.Cols(col...).Where("forbid_id=?", forbid.ForbidId).Update(forbid)
 	return err
 }
+
+// UserWithCouponAndCard 用户关联卡券信息
+type UserWithCouponAndCard struct {
+	model.SysUser  `xorm:"extends"`
+	CustomerCoupon []model.TaCustomerCoupon
+	CustomerCard   []model.TaCustomerCard
+	OrdersDetail   []model.TaGoodsOrdersDetail
+}
+
+// GetCaseUserByType 获取案场所有销售信息
+func (m *UserDAO) GetCaseUserByType(caseid, usertype string) ([]UserWithCouponAndCard, error) {
+	var users []UserWithCouponAndCard
+	sql := `select a.* from sys_user a inner join sys_user_type b on a.user_id=b.user_id
+	inner join sys_user_case c on a.user_id=c.user_id
+	where a.status>? and c.case_id =? and b.type_id=?`
+	err := m.db.Sql(sql, models.STATUS_DEL, caseid, usertype).Find(&users)
+	return users, err
+}
+
+// GetUserDetailByID 根据id获取案场销售
+func (m *UserDAO) GetUserDetailByID(userid string) (*UserWithCouponAndCard, error) {
+	var user UserWithCouponAndCard
+	sql := `select * from sys_user where status>? and user_id=?`
+	_, err := m.db.Sql(sql, models.STATUS_DEL, userid).Get(&user)
+	return &user, err
+}

routers/common.go

@@ -230,6 +230,7 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/coupon/:id", &coupon.CouponController{}, "get:GetCouponByIDForAdmin"),
 		beego.NSRouter("/coupon/:id", &coupon.CouponController{}, "put:UpdateCoupon"),
 		beego.NSRouter("/coupon/:id/to/:users", &coupon.CouponController{}, "post:GiveCoupon"),
+		beego.NSRouter("/coupon/type/:type", &coupon.CouponController{}, "get:GetCouponBySendType"),
 
 		// 卡
 		beego.NSRouter("/card", &card.CardController{}, "get:ListByCase"),

routers/wechat.go

@@ -41,5 +41,9 @@ func getWechatRoutes() beego.LinkNamespace {
 		beego.NSRouter("/user/forbid", &user.UserController{}, "get:GetForbidUsers"),
 		beego.NSRouter("/user/forbid/:userid/:type", &user.UserController{}, "post:SaveForbidUser"),
 		beego.NSRouter("/user/forbid/:userid/:type", &user.UserController{}, "put:OpenForbidUser"),
+
+		// 用户
+		beego.NSRouter("/user/:type", &user.UserController{}, "get:GetCaseUserByType"),
+		beego.NSRouter("/user/detail/:id", &user.UserController{}, "get:GetCaseUserByID"),
 	)
 }

service/cases/signin.go

@@ -2,15 +2,19 @@ package cases
 
 import (
 	"spaceofcheng/services/models/cases"
+	"spaceofcheng/services/models/marketing"
 	"spaceofcheng/services/utils"
-
+	"spaceofcheng/services/models/model"
 	"github.com/astaxie/beego"
+	"encoding/json"
 )
 
 // SigninServ 系统处理
 type SigninServ struct {
 	ctx *utils.Context
 	dao *cases.SigninDAO
+	marDao  *marketing.MarketingDAO
+	caseDao     *cases.CaseDAO
 }
 
 // NewSigninServ 初始化
@@ -18,6 +22,8 @@ func NewSigninServ(ctx *utils.Context) *SigninServ {
 	return &SigninServ{
 		ctx: ctx,
 		dao: cases.NewSigninDAO(ctx),
+		marDao: marketing.NewMarketingDAO(ctx),
+		caseDao: cases.NewCaseDAO(ctx),
 	}
 }
 
@@ -47,3 +53,58 @@ func (s *SigninServ) GetSigninWhere(selectType int, caseids string, page, pageSi
 		"page":     page,
 	}, err
 }
+
+// 添加 签到记录
+func (s *SigninServ) AddSignin(signin model.TaCheckinRecord,caseId string,activityId string,userMap *model.TaUserMapping) (*model.TaCheckinRecord,error) {
+	if signin.OpenId == "" {
+		return nil, utils.LogError("没有OpenId")
+	}
+	if signin.Phone == "" {
+		return nil, utils.LogError("没有Phone手机号")
+	}
+	if caseId == "" {
+		return nil,utils.LogError("没有案场ID")
+	}
+	if activityId == ""  {
+		return nil,utils.LogError("没有活动ID")
+	}
+
+	// 获取上下文的用户
+	user := s.ctx.Get("user").(model.SysUser)
+	casesInfo,err := s.caseDao.GetCaseByID(caseId)
+	activityInfo,err := s.marDao.GetMarketingById(activityId)
+	
+	// 定义Map
+	var jsonMap = map[string]string{}
+	accountInfo := userMap.AccountInfo
+	// 转换JSON
+	var jsonBlob = []byte(accountInfo)
+	jsonErr := json.Unmarshal(jsonBlob, &jsonMap)
+
+	if jsonErr != nil {
+		return nil,utils.LogError("accountInfo转换json失败")
+	}
+	// openId
+	signin.OpenId = jsonMap["openid"]
+	// 微信昵称
+	signin.CustomerName = jsonMap["nickname"]
+	// 客户姓名
+	signin.Name = user.UserName
+	// 客户ID
+	signin.CustomerId = user.UserId
+
+	// 案场
+	signin.CaseId = casesInfo.CaseId
+	signin.CaseName = casesInfo.CaseName
+
+	// 活动
+	signin.ActivityId = activityInfo.ActivityId
+	signin.ActivityName = activityInfo.ActivityName
+
+	info, err := s.dao.AddSignin(signin)
+	if err != nil {
+		return nil,err
+	}
+
+	return &info,err
+}

service/coupon/coupon.go

@@ -350,3 +350,34 @@ func (s *CouponServ) GetCouponByIDWithCheck(cpID string) (*coupon.CouponInfo, er
 
 	return cp, nil
 }
+
+// GetCouponBySendType 根据发送类型获取优惠券
+func (s *CouponServ) GetCouponBySendType(sendtype string) ([]model.TaCoupon, error) {
+	cases := s.ctx.Get("cases").([]model.SysUserCase)
+	caseIDs := ""
+	for _, value := range cases {
+		if caseIDs != "" {
+			caseIDs = caseIDs + ","
+		}
+		caseIDs = caseIDs + value.CaseId
+	}
+	coupon, err := s.dao.GetCouponBySendType(caseIDs, sendtype)
+	if err != nil {
+		utils.LogError("获取优惠券失败: " + err.Error())
+		return nil, errors.New("校验优惠券失败")
+	}
+	return coupon, nil
+}
+
+// GetCouponWithCustomer 获取优惠券明细
+func (s *CouponServ) GetCouponWithCustomer(couponid string) (*coupon.CaseCouponDetail, error) {
+	if couponid == "" {
+		return nil, errors.New("没有券信息！")
+	}
+	couponDetail, err := s.dao.GetCouponDetail(couponid)
+	if err != nil {
+		utils.LogError("获取优惠券失败: " + err.Error())
+		return nil, errors.New("获取优惠券失败")
+	}
+	return couponDetail, nil
+}

service/customer/customer.go

@@ -1,6 +1,7 @@
 package customer
 
 import (
+	"encoding/json"
 	"errors"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/cases"
@@ -104,15 +105,14 @@ func (s *CustomerServ) BindWechatUser(userMap *model.TaUserMapping, phone string
 	}
 
 	if cust == nil {
-		wxInfoRaw := s.ctx.Get("wxInfo")
-		if wxInfoRaw == nil {
-			return nil, errors.New("请确定使用微信端登录")
+		wxInfo := utils.WechatUser{}
+		if err := json.Unmarshal([]byte(userMap.AccountInfo), &wxInfo); err != nil {
+			utils.LogError("解析用户微信映射信息失败: " + err.Error())
+			return nil, errors.New("系统数据异常")
 		}
 
-		wxInfo := wxInfoRaw.(map[string]interface{})
 		// 更新用户手机号码信息及userid信息
-		openid := wxInfo["openid"].(string)
-		customer, err := s.dao.GetCustWithWXByOpenID(openid)
+		customer, err := s.dao.GetCustWithWXByOpenID(wxInfo.OpenID)
 
 		newCust := model.TaCustomer{
 			CustomerId: customer.CustomerId,
@@ -128,11 +128,6 @@ func (s *CustomerServ) BindWechatUser(userMap *model.TaUserMapping, phone string
 			return nil, err
 		}
 
-		// newCust, err := s.SaveNewCustomer(wxInfo, "", "", user.Phone, user.UserId)
-		// if err != nil {
-		// 	utils.LogError(err.Error())
-		// 	return nil, err
-		// }
 		cust = &newCust
 	} else {
 		if cust.Status != models.STATUS_NORMAL {
@@ -168,16 +163,14 @@ func (s *CustomerServ) BindWechatCust(userMap *model.TaUserMapping, phone, caseI
 
 	// 用户不存在, 则新增
 	if cust == nil {
-		wxInfoRaw := s.ctx.Get("wxInfo")
-		if wxInfoRaw == nil {
-			return nil, errors.New("请确定使用微信端登录")
+		wxInfo := utils.WechatUser{}
+		if err := json.Unmarshal([]byte(userMap.AccountInfo), &wxInfo); err != nil {
+			utils.LogError("解析用户微信映射信息失败: " + err.Error())
+			return nil, errors.New("系统数据异常")
 		}
 
-		wxInfo := wxInfoRaw.(map[string]interface{})
-
 		// 更新用户手机号码信息及userid信息
-		openid := wxInfo["openid"].(string)
-		customer, err := s.dao.GetCustWithWXByOpenID(openid)
+		customer, err := s.dao.GetCustWithWXByOpenID(wxInfo.OpenID)
 		newCust := model.TaCustomer{
 			CustomerId:  customer.CustomerId,
 			Phone:       phone,
@@ -228,12 +221,6 @@ func (s *CustomerServ) BindWechatCust(userMap *model.TaUserMapping, phone, caseI
 			return nil, err
 		}
 
-		// newCust, err := s.SaveNewCustomer(wxInfo, caseID, userID, phone, "")
-		// if err != nil {
-		// 	utils.LogError(err.Error())
-		// 	return nil, err
-		// }
-
 		cust = &newCust
 	} else {
 		if cust.Status != models.STATUS_NORMAL {

service/marketing/marketing.go

@@ -21,10 +21,11 @@ func NewMarketingServ(ctx *utils.Context) *MarketingServ {
 	return &MarketingServ{
 		ctx: ctx,
 		dao: marketing.NewMarketingDAO(ctx),
+		wdao: marketing.NewWorkDAO(ctx),
 	}
 }
 
-// GetCustWithWXList 获取客户列表
+// GetMarketingList 获取活动列表
 func (s *MarketingServ) GetMarketingList(page int, pageSize int) (map[string]interface{}, error) {
 
 	if pageSize == 0 {
@@ -54,14 +55,14 @@ func (s *MarketingServ) GetMarketingList(page int, pageSize int) (map[string]int
 /**
 * resource_desc 活动描述
  */
-func (s *MarketingServ) SaveMarketing(activity model.SysActivity, resourceDesc string) (*model.SysActivity, *model.SysActivityAction, error) {
+func (s *MarketingServ) SaveMarketing(activity model.SysActivity, resourceDesc string, caseId string) (*model.SysActivity, *model.SysActivityAction, error) {
 
 	var newInfo *model.SysActivity
 	var newWoke *model.SysActivityAction
 
 	var err error
 	// 存储 营销活动
-	newInfo, err = s.dao.AddMarketing(&activity)
+	newInfo, err = s.dao.AddMarketing(activity,caseId)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -70,9 +71,10 @@ func (s *MarketingServ) SaveMarketing(activity model.SysActivity, resourceDesc s
 	woke.ActivityId = newInfo.ActivityId
 	woke.ActiveType = newInfo.ActivityType
 	woke.ResourceDesc = resourceDesc
+	woke.ResourceType = "占位符"
 
 	// 存储 活动动作
-	newWoke, err = s.wdao.AddWork(&woke)
+	newWoke, err = s.wdao.AddWork(woke)
 	if err != nil {
 		return nil, nil, err
 	}

service/marketing/work.go

@@ -24,8 +24,7 @@ func NewWorkServ(ctx *utils.Context) *WorkServ {
 }
 
 // 保存 Work
-func (s *WorkServ) SaveWork(work *model.SysActivityAction)  (*model.SysActivityAction, error){
-		var newInfo *model.SysActivityAction
+func (s *WorkServ) SaveWork(work model.SysActivityAction)  (*model.SysActivityAction, error){
 		if work.ActivityId == "" {
 			return nil, utils.LogError("营销编号为空!")
 		}

service/statistics/dashboard.go

@@ -0,0 +1,37 @@
+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
+// }

service/statistics/setting.go

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

service/statistics/statistics.go

@@ -0,0 +1,20 @@
+package statistics
+
+import (
+	"spaceofcheng/services/models/statistics"
+	"spaceofcheng/services/utils"
+)
+
+// StatisticsServ 系统处理
+type StatisticsServ struct {
+	ctx *utils.Context
+	dao *statistics.StatisticsDAO
+}
+
+// NewStatisticsServ 初始化
+func NewStatisticsServ(ctx *utils.Context) *StatisticsServ {
+	return &StatisticsServ{
+		ctx: ctx,
+		dao: statistics.NewStatisticsDAO(ctx),
+	}
+}

service/sys.go

@@ -3,12 +3,17 @@ package service
 import (
 	"encoding/json"
 	"errors"
+	"net/http"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/customer"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
+	"strings"
+	"time"
 
 	"github.com/astaxie/beego"
+	"github.com/astaxie/beego/context"
 )
 
 const (
@@ -17,6 +22,7 @@ const (
 
 // SysServ 系统处理
 type SysServ struct {
+	org         model.SysOrg
 	ctx         *utils.Context
 	dao         *models.SysDAO
 	customerdao *customer.CustomerDAO
@@ -31,6 +37,363 @@ func NewSysServ(ctx *utils.Context) *SysServ {
 	}
 }
 
+// AuthAndInitCtx 鉴权
+// gctx 是 beego 框架中的 Context
+func (s *SysServ) AuthAndInitCtx(gctx *context.Context) map[string]interface{} {
+	// 确认机构
+	orgID := gctx.Input.Query(":org")
+	if orgID == "" {
+		return map[string]interface{}{
+			"code":  http.StatusBadRequest,
+			"error": errors.New("接口地址访问不正确"),
+		}
+	}
+	if err := s.SetOrgByID(orgID); err != nil {
+		return map[string]interface{}{
+			"code":  http.StatusInternalServerError,
+			"error": err,
+		}
+	}
+
+	// 客户端类型
+	// 通过 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)
+	}
+
+	// wechat 端
+	if clientType == utils.ClientWechat {
+		return s.authWechat(gctx, token)
+	}
+
+	return map[string]interface{}{
+		"code":  http.StatusBadRequest,
+		"error": errors.New("暂无该客户端的 API"),
+	}
+}
+
+// NewToken 设置 TOKEN
+// 15 分钟后过期
+func (s *SysServ) NewToken() string {
+	var token *utils.JWTToken
+	exp := time.Now().Local().Add(15 * time.Second)
+
+	if s.ctx.Get("userMap") != nil {
+		userMap := s.ctx.Get("userMap").(model.TaUserMapping)
+
+		token = &utils.JWTToken{
+			Guest:  false,
+			ID:     userMap.Openid,
+			Expire: exp,
+		}
+	} else if s.ctx.Get("user") != nil {
+		user := s.ctx.Get("user").(model.SysUser)
+
+		token = &utils.JWTToken{
+			Guest:  false,
+			ID:     user.UserId,
+			Expire: exp,
+		}
+	} else {
+		token = &utils.JWTToken{
+			Guest:  true,
+			Expire: exp,
+		}
+	}
+
+	tokenEncodeStr, err := utils.CreateToken(token.ToMap())
+	if err != nil {
+		utils.LogError("系统生成 Token 失败: " + err.Error())
+		return ""
+	}
+
+	// 入库
+	if !token.Guest {
+		if err := s.dao.InsertToken(tokenEncodeStr); err != nil {
+			utils.LogError("入库 Token 失败: " + err.Error())
+			return tokenEncodeStr
+		}
+	}
+
+	return tokenEncodeStr
+}
+
+// authPCAdmin
+// 管理端 API 校验
+func (s *SysServ) authPCAdmin(gctx *context.Context, token *utils.JWTToken) map[string]interface{} {
+	if !s.needAuth(gctx) {
+		return nil
+	}
+
+	if token.ID == "" || token.Guest == true {
+		return map[string]interface{}{
+			"code":  http.StatusUnauthorized,
+			"error": errors.New("用户未登录"),
+		}
+	}
+
+	if err := s.SetUserProfile(token.ID); err != nil {
+		return map[string]interface{}{
+			"code":  http.StatusInternalServerError,
+			"error": err,
+		}
+	}
+
+	return nil
+}
+
+func (s *SysServ) authWechat(gctx *context.Context, token *utils.JWTToken) map[string]interface{} {
+	// 微信 code
+	code := gctx.Input.Query("code")
+
+	var wxUser *utils.WechatUser
+	var openID string
+
+	// 未登录 或 未验证
+	if token.ID == "" {
+		// 微信用户信息
+		var err error
+		wxUser, err = s.wechartSignIn(gctx, code)
+		if err != nil {
+			if strings.Index(err.Error(), strconv.Itoa(http.StatusUnauthorized)) > -1 {
+				return map[string]interface{}{
+					"code":  http.StatusUnauthorized,
+					"error": errors.New("请授权微信用户登录"),
+					"message": map[string]interface{}{
+						"appid": utils.GetWxAppID(s.org.OrgId),
+					},
+				}
+			}
+
+			return map[string]interface{}{
+				"code":  http.StatusInternalServerError,
+				"error": err,
+			}
+		}
+
+		if wxUser == nil {
+			return map[string]interface{}{
+				"code":  http.StatusInternalServerError,
+				"error": errors.New("请先关注公众号"),
+			}
+		}
+
+		openID = wxUser.OpenID
+	} else {
+		openID = token.ID
+	}
+
+	// 查询数据库是否存在已有映射
+	userMapList, err := s.dao.GetUserMappingByOpenID(openID)
+	if err != nil {
+		utils.LogError("校验人员失败: " + err.Error())
+		return map[string]interface{}{
+			"code":  http.StatusInternalServerError,
+			"error": errors.New("校验人员失败"),
+		}
+	}
+
+	var userMapping *model.TaUserMapping
+	for _, ump := range userMapList {
+		if openID == ump.Openid && models.ACCMAP_WECHAT == ump.AccountType {
+			userMapping = &ump
+		}
+	}
+
+	// 如果尚无人员映射信息, 代表人员初次使用本系统
+	if userMapping == nil {
+		// 如果没有微信用户信息, 代表产生了未知异常
+		if wxUser == nil || wxUser.UnionID == "" {
+			return map[string]interface{}{
+				"code":  http.StatusInternalServerError,
+				"error": errors.New("系统异常, 请清空缓存后重试"),
+			}
+		}
+
+		wxInfoJSON, err := json.Marshal(wxUser)
+		if err != nil {
+			utils.LogError("转换微信json信息失败: " + err.Error())
+			return map[string]interface{}{
+				"code":  http.StatusInternalServerError,
+				"error": errors.New("微信信息异常"),
+			}
+		}
+
+		userMapping = &model.TaUserMapping{
+			AccountType: models.ACCMAP_WECHAT,
+			Openid:      openID,
+			Uuid:        wxUser.UnionID,
+			AccountInfo: string(wxInfoJSON),
+		}
+	}
+
+	// 更新映射信息, 没有的话则插入
+	err = s.dao.UpdateUserMapping(userMapping)
+	if err != nil {
+		utils.LogError("保存用户映射信息失败: " + err.Error())
+		return map[string]interface{}{
+			"code":  http.StatusInternalServerError,
+			"error": errors.New("更新用户信息失败"),
+		}
+	}
+	s.ctx.Set("userMap", *userMapping)
+
+	if !s.needAuth(gctx) {
+		return nil
+	}
+
+	var cust *model.TaCustomer
+
+	// 如果只有映射, 但是没有人员信息
+	// 则新增人员
+	if userMapping.UserId == "" {
+		cust, err = s.saveNewCustomer(wxUser, userMapping)
+		if err != nil {
+			return map[string]interface{}{
+				"code":  http.StatusInternalServerError,
+				"error": err,
+			}
+		}
+	} else {
+		cust, err = s.customerdao.GetCustomerByID(userMapping.UserId)
+		if err != nil {
+			utils.LogError("查询用户信息失败: " + err.Error())
+			return map[string]interface{}{
+				"code":  http.StatusInternalServerError,
+				"error": err,
+			}
+		}
+	}
+	s.ctx.Set("customer", *cust)
+
+	if cust.UserId != "" {
+		if err := s.SetUserProfile(cust.UserId); err != nil {
+			return map[string]interface{}{
+				"code":  http.StatusInternalServerError,
+				"error": err,
+			}
+		}
+	}
+
+	return nil
+}
+
+// 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)
+	if err != nil {
+		utils.LogError("获取微信信息失败: " + err.Error())
+
+		if wxUserMap == nil {
+			return nil, errors.New("获取微信信息失败")
+		}
+	}
+
+	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
+	}
+
+	tokenRaw := gctx.Input.Header(utils.TokenHeader)
+	if tokenRaw == "" {
+		return new(utils.JWTToken), nil
+	}
+
+	tokenEnStr := strings.Trim(strings.TrimLeft(tokenRaw, utils.TokenSchema), " ")
+	s.ctx.Set("token", tokenEnStr)
+
+	token, err := utils.PareseToken(tokenEnStr)
+	if err != nil {
+		utils.LogError("解析 Token 失败: " + err.Error())
+		return nil, errors.New("解析Token失败或已过期")
+	}
+
+	// 校验 token
+	tk, err := s.dao.GetToken(tokenEnStr)
+	if err != nil {
+		utils.LogError("查询 Token 失败: " + err.Error())
+		return nil, errors.New("校验Token失败或已过期")
+	}
+
+	if tk.Status == models.STATUS_DEL {
+		return nil, errors.New("超时 或者 Token 已过期")
+	}
+
+	return utils.MapToJWTToken(token), nil
+}
+
+// UpdateTokenExpire 更新 token 为过期
+// 如果发生错误, 此处选择忽略
+func (s *SysServ) UpdateTokenExpire(token string) {
+	if err := s.dao.UpdateTokenExpire(token); err != nil {
+		utils.LogError("更新 Token 过期失败: " + err.Error())
+	}
+}
+
+func (s *SysServ) needAuth(gctx *context.Context) bool {
+	route := gctx.Input.URL()
+	apiPrefix := beego.AppConfig.String("api::prefix")
+	guestAPI := beego.AppConfig.String("api::guest")
+
+	if strings.Index(route, apiPrefix+strings.Split(guestAPI, ":")[0]) > -1 {
+		return false
+	}
+
+	return true
+}
+
 // SetUserProfile 设置用户信息
 func (s *SysServ) SetUserProfile(id string) error {
 	user, err := s.dao.GetPureUserInfo(id)
@@ -60,32 +423,14 @@ func (s *SysServ) SetUserProfile(id string) error {
 	return nil
 }
 
-// SetCustomer 设置客户信息
-func (s *SysServ) SetCustomer(id string) error {
-	cust, err := s.dao.GetCustomer(id)
-	if err != nil {
-		return utils.LogError("获取客户基本信息失败: " + err.Error())
-	}
-
-	s.ctx.Set("customer", *cust)
-	return nil
-}
-
-// SaveNewCustomer 新增用户
-func (s *SysServ) SaveNewCustomer(wxInfo map[string]interface{}, userMap *model.TaUserMapping) (*model.TaCustomer, error) {
-	// 微信相关字段
-	nickyName := wxInfo["nickname"].(string)
-	sex := wxInfo["sex"].(float64)
-	headimgurl := wxInfo["headimgurl"].(string)
-
-	org := s.ctx.Get("org").(model.SysOrg)
-
+// saveNewCustomer 新增用户
+func (s *SysServ) saveNewCustomer(wxUser *utils.WechatUser, userMap *model.TaUserMapping) (*model.TaCustomer, error) {
 	cust := model.TaCustomer{
-		CustomerName: nickyName,
-		Name:         nickyName,
-		Sex:          int(sex),
-		Headimgurl:   headimgurl,
-		OrgId:        org.OrgId,
+		CustomerName: wxUser.NickName,
+		Name:         wxUser.NickName,
+		Sex:          int(wxUser.Sex),
+		Headimgurl:   wxUser.HeadImgURL,
+		OrgId:        s.org.OrgId,
 	}
 
 	if err := s.customerdao.SaveCustomer(&cust); err != nil {
@@ -130,7 +475,6 @@ func (s *SysServ) CheckWechatUserMapping(user map[string]interface{}) (*model.Ta
 
 	accountRaw, err := json.Marshal(user)
 	if err != nil {
-		beego.Error(err)
 		return nil, err
 	}
 	account := string(accountRaw)
@@ -146,7 +490,6 @@ func (s *SysServ) CheckWechatUserMapping(user map[string]interface{}) (*model.Ta
 	userMapList, err := s.dao.GetUserMappingByOpenID(openID)
 
 	if err != nil {
-		beego.Error(err)
 		return nil, err
 	}
 
@@ -172,28 +515,32 @@ func (s *SysServ) CheckWechatUserMapping(user map[string]interface{}) (*model.Ta
 	return &userMapping, nil
 }
 
-// GetWeChatConfig 获取微信配置
-func (s SysServ) GetWeChatConfig(org string) (map[string]string, error) {
-	conf, err := s.dao.GetWeChatConfig(org)
+// initWechatClient 初始化微信客户端
+func (s *SysServ) initWechatClient(orgID string) error {
+	conf, err := s.dao.GetWeChatConfig(orgID)
 	if err != nil {
-		return nil, err
+		utils.LogError("获取微信配置失败: " + err.Error())
+		return errors.New("获取微信配置失败")
 	}
 
-	if conf.ConfId == "" {
-		return nil, errors.New("未找到微信配置")
+	if conf == nil || conf.ConfId == "" {
+		return errors.New("未找到微信配置")
 	}
 
-	return map[string]string{
+	cert := map[string]string{
 		"appid":  conf.Appid,
 		"secret": conf.Secret,
 		"token":  conf.Token,
 		"aeskey": conf.Aeskey,
 		"wxid":   conf.Wxid,
-	}, nil
+	}
+
+	utils.WxClientSingleton(orgID, cert)
+	return nil
 }
 
 // SetOrgByID 获取组织
-func (s SysServ) SetOrgByID(orgID string) error {
+func (s *SysServ) SetOrgByID(orgID string) error {
 	orgID = utils.DecodeBase64NoTail(orgID)
 
 	org, err := s.dao.GetOrg(orgID)
@@ -203,6 +550,7 @@ func (s SysServ) SetOrgByID(orgID string) error {
 	}
 
 	s.ctx.Set("org", *org)
+	s.org = *org
 
 	return nil
 }

service/user.go

@@ -3,8 +3,11 @@ package service
 import (
 	"errors"
 	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/card"
 	"spaceofcheng/services/models/cases"
+	"spaceofcheng/services/models/coupon"
 	"spaceofcheng/services/models/customer"
+	"spaceofcheng/services/models/goods"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/models/system"
 	"spaceofcheng/services/utils"
@@ -19,6 +22,9 @@ type UserServ struct {
 	dao         *system.UserDAO
 	casedao     *cases.CaseDAO
 	customerdao *customer.CustomerDAO
+	carddao     *card.CardDAO
+	coupondao   *coupon.CouponDAO
+	ordersdao   *goods.GoodsDAO
 }
 
 // NewUserServ 初始化
@@ -28,6 +34,9 @@ func NewUserServ(ctx *utils.Context) *UserServ {
 		dao:         system.NewUserDAO(ctx),
 		casedao:     cases.NewCaseDAO(ctx),
 		customerdao: customer.NewCustomerDAO(ctx),
+		carddao:     card.NewCardDAO(ctx),
+		coupondao:   coupon.NewCouponDAO(ctx),
+		ordersdao:   goods.NewGoodsDAO(ctx),
 	}
 }
 
@@ -411,11 +420,19 @@ func (s *UserServ) GetUserByTel(tel string) (*model.SysUser, error) {
 }
 
 // GetForbidUsers 获取所有禁止人员信息
-func (s *UserServ) GetForbidUsers(caseid string) ([]model.TaForbidUser, error) {
-	if err := utils.NewAuthEngine(s.ctx).CheckCase(caseid); err != nil {
+func (s *UserServ) GetForbidUsers() ([]model.TaForbidUser, error) {
+	customer := s.ctx.Get("customer").(model.TaCustomer)
+	if customer.CustomerId == "" || customer.UserId == "" {
+		return nil, errors.New("当前用户没有权限查看用户信息")
+	}
+	caseinfo, err := s.dao.GetUserBelongCase(customer.UserId)
+	if err != nil {
 		return nil, err
 	}
-	users, err := s.dao.GetForbidUsers(caseid)
+	// if err := utils.NewAuthEngine(s.ctx).CheckCase(caseid); err != nil {
+	// 	return nil, err
+	// }
+	users, err := s.dao.GetForbidUsers(caseinfo.CaseId)
 	return users, err
 }
 
@@ -508,3 +525,84 @@ func (s *UserServ) OpenForbidUser(userid string, forbidtype string) error {
 	err = s.dao.OpenForbidUser(&forbiduser)
 	return err
 }
+
+// GetCaseUserByType 根据用户类型获取人员信息
+func (s *UserServ) GetCaseUserByType(usertype string) ([]system.UserWithCouponAndCard, error) {
+	customer := s.ctx.Get("customer").(model.TaCustomer)
+	if customer.CustomerId == "" || customer.UserId == "" {
+		return nil, errors.New("当前用户没有权限查看用户信息")
+	}
+	caseinfo, err := s.dao.GetUserBelongCase(customer.UserId)
+	if err != nil {
+		utils.LogError("获取人员归属案场失败: " + err.Error())
+		return nil, errors.New("获取人员信息失败")
+	}
+
+	users, err := s.dao.GetCaseUserByType(caseinfo.CaseId, usertype)
+	if err != nil {
+		utils.LogError("获取人员信息失败: " + err.Error())
+		return nil, errors.New("获取人员信息失败")
+	}
+	for inx, user := range users {
+		err := s.GetUserWithDetail(caseinfo.CaseId, &user)
+		if err != nil {
+			return nil, err
+		}
+		users[inx] = user
+	}
+	return users, nil
+}
+
+// GetCaseUserByUserID 根据用户id获取人员信息
+func (s *UserServ) GetCaseUserByUserID(userid string) (*system.UserWithCouponAndCard, error) {
+	customer := s.ctx.Get("customer").(model.TaCustomer)
+	if customer.CustomerId == "" || customer.UserId == "" {
+		return nil, errors.New("当前用户没有权限查看用户信息")
+	}
+	caseinfo, err := s.dao.GetUserBelongCase(customer.UserId)
+	if err != nil {
+		utils.LogError("获取人员归属案场失败: " + err.Error())
+		return nil, errors.New("获取人员信息失败")
+	}
+	usercaseinfo, err := s.dao.GetUserBelongCase(userid)
+	if err != nil {
+		utils.LogError("获取人员归属案场失败: " + err.Error())
+		return nil, errors.New("获取人员信息失败")
+	}
+	if usercaseinfo.CaseId != caseinfo.CaseId {
+		return nil, errors.New("您没有权限查看此用户的数据！")
+	}
+	user, err := s.dao.GetUserDetailByID(userid)
+	if err != nil {
+		utils.LogError("获取人员信息失败: " + err.Error())
+		return nil, errors.New("获取人员信息失败")
+	}
+	err = s.GetUserWithDetail(usercaseinfo.CaseId, user)
+	if err != nil {
+		return nil, err
+	}
+	return user, nil
+}
+
+// GetUserWithDetail 获取用户详情
+func (s *UserServ) GetUserWithDetail(caseid string, user *system.UserWithCouponAndCard) error {
+	cards, err := s.carddao.GetCustomerCardByUser(caseid, user.UserId)
+	if err != nil {
+		utils.LogError("获取发送卡信息失败: " + err.Error())
+		return errors.New("获取人员信息失败")
+	}
+	user.CustomerCard = cards
+	coupons, err := s.coupondao.GetCustomerCouponByUser(caseid, user.UserId)
+	if err != nil {
+		utils.LogError("获取发送券信息失败: " + err.Error())
+		return errors.New("获取人员信息失败")
+	}
+	user.CustomerCoupon = coupons
+	details, err := s.ordersdao.GetOrderDetailByUser(caseid, user.UserId)
+	if err != nil {
+		utils.LogError("获取用户点单信息失败: " + err.Error())
+		return errors.New("获取人员信息失败")
+	}
+	user.OrdersDetail = details
+	return nil
+}

utils/excel.go

@@ -0,0 +1,68 @@
+package utils
+
+import (
+	"io"
+	"reflect"
+
+	"github.com/tealeg/xlsx"
+)
+
+// TinyXLSXEngine 简版 xlsx 处理器
+type TinyXLSXEngine struct {
+	xlsxFile *xlsx.File
+	toSlice  func(interface{}) []interface{}
+}
+
+// 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 {
+	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
+		}
+	}
+
+	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)
+
+			row := sheet.AddRow()
+			for _, col := range cols {
+				row.AddCell().SetValue(col)
+			}
+		}
+	}
+
+	return t
+}
+
+// Write 写数据
+func (t *TinyXLSXEngine) Write(w io.Writer) error {
+	return t.xlsxFile.Write(w)
+}

utils/jwt.go

@@ -2,10 +2,16 @@ package utils
 
 import (
 	"errors"
+	"time"
 
 	jwt "github.com/dgrijalva/jwt-go"
 )
 
+const (
+	TokenHeader = "Authorization"
+	TokenSchema = "Bearer"
+)
+
 var tokenSignedKey = []byte(`Yansen is so handsome!`)
 
 // CreateToken 获取token
@@ -32,3 +38,45 @@ func PareseToken(token string) (map[string]interface{}, error) {
 
 	return nil, errors.New("Token 解析 未知错误")
 }
+
+// JWTToken token 内容
+type JWTToken struct {
+	Guest    bool
+	ID       string
+	Password string
+	Expire   time.Time
+}
+
+// ToMap 转 map
+func (t *JWTToken) ToMap() map[string]interface{} {
+	return map[string]interface{}{
+		"guest":    t.Guest,
+		"user":     t.ID,
+		"password": t.Password,
+		"exp":      t.Expire.Format("2006-01-02 15:04:05"),
+	}
+}
+
+// MapToJWTToken map 映射 Token
+func MapToJWTToken(data map[string]interface{}) *JWTToken {
+	token := JWTToken{}
+
+	if data["guest"] != nil {
+		token.Guest = data["guest"].(bool)
+	}
+
+	if data["user"] != nil {
+		token.ID = data["user"].(string)
+	}
+
+	if data["password"] != nil {
+		token.Password = data["password"].(string)
+	}
+
+	if data["exp"] != nil {
+		exp, _ := time.Parse("2006-01-02 15:04:05", data["exp"].(string))
+		token.Expire = exp
+	}
+
+	return &token
+}

utils/wechat.go

@@ -6,6 +6,17 @@ import (
 
 var wxClients map[string]*wx.Client
 
+type WechatUser struct {
+	OpenID     string  `json:"openid"`
+	NickName   string  `json:"nickname"`
+	Sex        float64 `json:"sex"`
+	Province   string  `json:"province"`
+	City       string  `json:"city"`
+	Country    string  `json:"country"`
+	HeadImgURL string  `json:"headimgurl"`
+	UnionID    string  `json:"unionid"`
+}
+
 // WxClientSingleton 初始化
 func WxClientSingleton(org string, cert map[string]string) {
 	if wxClients == nil {
@@ -32,3 +43,48 @@ func GetWxAppID(org string) string {
 func init() {
 	wx.SetLogInst(defaultLogger)
 }
+
+// MapToWechatUser 映射微信人员
+func MapToWechatUser(data map[string]interface{}) *WechatUser {
+	subscribe, has := data["subscribe"]
+	if has {
+		if subscribe == nil {
+			return nil
+		}
+
+		sub := subscribe.(float64)
+		if sub == 0 {
+			return nil
+		}
+	}
+
+	user := WechatUser{
+		OpenID: data["openid"].(string),
+	}
+
+	if data["sex"] != nil {
+		user.Sex = data["sex"].(float64)
+	}
+
+	if data["province"] != nil {
+		user.Province = data["province"].(string)
+	}
+
+	if data["city"] != nil {
+		user.City = data["city"].(string)
+	}
+
+	if data["country"] != nil {
+		user.Country = data["country"].(string)
+	}
+
+	if data["headimgurl"] != nil {
+		user.HeadImgURL = data["headimgurl"].(string)
+	}
+
+	if data["unionid"] != nil {
+		user.UnionID = data["unionid"].(string)
+	}
+
+	return &user
+}