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

conf/app.conf

@@ -29,3 +29,8 @@ guest = "/guest/:org"
 common = "/common/:org"
 wechat = "/wechat/:org"
 
+
+postwechatInfo = http://testapi.chioy.com.cn/api/network/postwechatInfo
+qrcodePrefix = bodycheck_
+followText = 您正在使用悦琦设备进行体检~
+resultURL = http://dev.ycjcjy.com/bodyCheck

conf/wechat.conf

@@ -0,0 +1 @@
+messageTplID = 1ft8YDwqOYwIHxTXXVlJh5Q7ST5qU1a0qlnF6B6TCBU

controllers/base.go

@@ -48,6 +48,13 @@ func (c *BaseController) ResponseError(err error, code ...int) {
 	c.ResponseData(nil, err, http.StatusBadRequest)
 }
 
+// ResponseRaw 返回
+func (c *BaseController) ResponseRaw(msg []byte) {
+	c.destroyContext(true)
+	c.Ctx.ResponseWriter.Write(msg)
+	c.StopRun()
+}
+
 // ResponseData 自定义的JSON返回
 func (c *BaseController) ResponseData(data interface{}, msg interface{}, code int) {
 	status := code

controllers/bodycheck/bodycheck.go

@@ -4,77 +4,30 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"spaceofcheng/services/controllers"
-	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/bodycheck"
 	"spaceofcheng/services/utils"
-	"strconv"
-	"time"
-
-	"github.com/astaxie/beego"
-
-	"github.com/astaxie/beego/config"
-	"github.com/zjxpcyc/wechat/wx"
 )
 
-// BodyCheckController 应用
+// BodyCheckController 商品
 type BodyCheckController struct {
-	dao *bodycheck.BodycheckServ
+	serv *bodycheck.BodyCheckServ
 	controllers.BaseController
-	weixin *wx.Client
 }
 
 // Constructor 初始化 Controller
 // @Title Constructor
 // @Description 初始化 Controller, 系统自动调用
 func (c *BodyCheckController) Constructor() {
-	c.dao = bodycheck.NewBodycheckServ(c.Context)
-	org := c.Context.Get("org").(model.SysOrg)
-	c.weixin = utils.WxClientFor(org.OrgId)
+	c.serv = bodycheck.NewBodyCheckServ(c.Context)
 }
 
 // GetCheckByUser 根据用户获取体检报告
 func (c *BodyCheckController) GetCheckByUser() {
-	code := c.GetString("code")
-	openid, err := c.weixin.GetOpenID(code)
-	if err != nil {
-		beego.Error("获取openid失败！", err.Error())
-		c.ResponseError(err)
-	}
-	// openid := "o5EGQ0ytw9JUpSa6N84ddo3CYFO4"
-	user, err := c.dao.GetUserByOpenID(openid)
+	info, err := c.serv.GetCheckByUser()
 	if err != nil {
 		c.ResponseError(err)
 	}
-	if user == nil {
-		c.ResponseError(err)
-	}
-
-	bodyCheck, err := c.dao.GetBodyCheckByUser(user.CustomerId)
-	if err != nil {
-		c.ResponseJSON(map[string]interface{}{
-			"Status":  false,
-			"Message": err.Error(),
-		})
-	}
-	if len(bodyCheck) == 0 {
-		c.ResponseJSON(map[string]interface{}{
-			"Status":  false,
-			"Message": "没有查询到数据",
-		})
-	}
-	presentations, err := c.dao.GetPresentationByCheckID(bodyCheck[0].Id)
-	if err != nil {
-		c.ResponseJSON(map[string]interface{}{
-			"Status":  false,
-			"Message": err.Error(),
-		})
-	}
-	c.ResponseJSON(map[string]interface{}{
-		"Status":   true,
-		"Message":  presentations,
-		"Info":     bodyCheck,
-		"UserInfo": user,
-	})
+	c.ResponseJSON(info)
 }
 
 // PostCheckResult 测量结果返回
@@ -86,213 +39,14 @@ func (c *BodyCheckController) PostCheckResult() {
 	var formVal map[string]interface{}
 	err := json.Unmarshal(con, &formVal)
 	if err != nil {
-		beego.Error(err)
-		c.ResponseJSON(map[string]interface{}{
-			"Status":  false,
-			"Message": err.Error(),
-		})
-	}
-
-	type CheckResult struct {
-		WechatAccount string
-		EquipmentId   string
-		CheckType     int
-		CheckDate     time.Time
-		CheckResult   string
-		ReportUrl     string
-		HMSReportUrl  string
-	}
-
-	var result = CheckResult{}
-
-	result.EquipmentId = formVal["EquipmentId"].(string)
-	result.WechatAccount = formVal["WechatAccount"].(string)
-	// result.CheckResult = formVal["CheckResult"].(string)
-	result.CheckResult = ""
-	result.ReportUrl = formVal["ReportUrl"].(string)
-	result.HMSReportUrl = formVal["HMSReportUrl"].(string)
-	result.CheckType = int(formVal["CheckType"].(float64))
-	if err != nil {
-		beego.Error(err.Error())
-		c.ResponseJSON(map[string]interface{}{
-			"Status":  false,
-			"Message": err.Error(),
-		})
-	}
-	loc, _ := time.LoadLocation("Local")
-	result.CheckDate, err = time.ParseInLocation("2006-01-02 15:04:05", formVal["CheckDate"].(string), loc)
-	if err != nil {
-		beego.Error(err.Error())
-		c.ResponseJSON(map[string]interface{}{
-			"Status":  false,
-			"Message": err.Error(),
-		})
-	}
-
-	user, err := c.dao.GetUserByOpenID(result.WechatAccount)
-	if err != nil {
-		beego.Error(err.Error())
-		c.ResponseJSON(map[string]interface{}{
-			"Status":  false,
-			"Message": err.Error(),
-		})
-	}
-
-	if user == nil || user.CustomerId == "" {
-		beego.Error("没有当前用户信息！")
-		c.ResponseJSON(map[string]interface{}{
-			"Status":  false,
-			"Message": "没有当前用户信息！",
-		})
-	}
-	userid := user.CustomerId
-
-	checkinfo, err := c.dao.GetCheckByUserAndEquipmentID(userid, result.EquipmentId)
-	if err != nil {
-		beego.Error(err.Error())
-		c.ResponseJSON(map[string]interface{}{
-			"Status":  false,
-			"Message": err.Error(),
-		})
-	}
-	if checkinfo == nil || checkinfo.Id < 1 || time.Now().Local().Format("2006-01-02") != checkinfo.CreateDate.Format("2006-01-02") {
-		caseEquipment, err := c.dao.GetCaseEquipment(result.EquipmentId)
-		if err != nil {
-			beego.Error(err.Error())
-			c.ResponseJSON(map[string]interface{}{
-				"Status":  false,
-				"Message": err.Error(),
-			})
-		}
-		if caseEquipment == nil || caseEquipment.Id < 1 {
-			beego.Error("设备未维护！")
-			c.ResponseJSON(map[string]interface{}{
-				"Status":  false,
-				"Message": "设备未维护！",
-			})
-		}
-		var checkNew = model.TaBodyCheck{}
-		checkNew.CaseId = caseEquipment.CaseId
-		checkNew.EquipmentId = result.EquipmentId
-		checkNew.UserId = userid
-		checkNew.ReportUrl = result.HMSReportUrl
-		checkNew.CreateDate = result.CheckDate
-		checkinfo, err = c.dao.SaveBodyCheckInfo(checkNew)
-
-		wxconf, _ := config.NewConfig("ini", "conf/wechat.conf")
-		messageTplID := wxconf.String("messageTplID")
-
-		c.weixin.SendTplMessage(result.WechatAccount, messageTplID, beego.AppConfig.String("resultURL"), map[string]wx.TplMessageData{
-			"first": wx.TplMessageData{
-				Value: "您的体检报告已生成",
-			},
-			"keyword1": wx.TplMessageData{
-				Value: strconv.Itoa(checkinfo.Id),
-			},
-			"keyword2": wx.TplMessageData{
-				Value: result.CheckDate.Format("2006-01-02 15:04"),
-			},
-			"remark": wx.TplMessageData{
-				Value: "",
-			},
-		})
-	}
-
-	presentation, err := c.dao.GetPresentation(checkinfo.Id, result.CheckType)
-	if err != nil {
-		beego.Error(err.Error())
-		c.ResponseJSON(map[string]interface{}{
-			"Status":  false,
-			"Message": err.Error(),
-		})
-	}
-	if presentation == nil || presentation.Id < 1 {
-		// 新增
-		var preNew = model.TaPresentation{}
-		preNew.CheckId = checkinfo.Id
-		preNew.CheckDate = result.CheckDate
-		preNew.CheckResult = result.CheckResult
-		preNew.CheckType = result.CheckType
-		preNew.ReportUrl = result.ReportUrl
-		presentation, err = c.dao.SavePresentation(preNew)
-		if err != nil {
-			beego.Error(err.Error())
-			c.ResponseJSON(map[string]interface{}{
-				"Status":  false,
-				"Message": err.Error(),
-			})
-		}
-	} else {
-		// 修改
-		presentation.CheckDate = result.CheckDate
-		presentation.CheckResult = result.CheckResult
-		presentation.ReportUrl = result.ReportUrl
-		err = c.dao.UpdatePresentation(presentation)
-		if err != nil {
-			beego.Error(err.Error())
-			c.ResponseJSON(map[string]interface{}{
-				"Status":  false,
-				"Message": err.Error(),
-			})
-		}
-		// 删除之前的记录
-		err = c.dao.DeletePresentionDetail(presentation.Id)
-		if err != nil {
-			beego.Error(err.Error())
-			c.ResponseJSON(map[string]interface{}{
-				"Status":  false,
-				"Message": err.Error(),
-			})
-		}
+		utils.LogError("参数错误：", err)
+		c.ResponseError(err)
 	}
 
-	specs, err := c.dao.GetCheckSpecs()
+	err = c.serv.PostCheckResult(formVal)
 	if err != nil {
-		beego.Error(err.Error())
-		c.ResponseJSON(map[string]interface{}{
-			"Status":  false,
-			"Message": err.Error(),
-		})
-	}
-
-	if len(formVal) > 0 {
-		var details []model.TaPresentationDetail
-		for k, v := range formVal {
-			if k != "WechatAccount" && k != "EquipmentId" && k != "CheckType" && k != "CheckDate" && k != "CheckResult" && k != "ReportUrl" && k != "HMSReportUrl" && k != "WXID" {
-				var detail model.TaPresentationDetail
-				detail.CheckName = k
-				switch vx := v.(type) {
-				case string:
-					detail.CheckVal = vx
-				case float64:
-					detail.CheckVal = strconv.FormatFloat(vx, 'f', 2, 64)
-				}
-
-				detail.PresentationId = presentation.Id
-				var specName = ""
-				for _, spec := range specs {
-					if spec.SortName == k {
-						specName = spec.Name
-						break
-					}
-				}
-				detail.SpecName = specName
-				details = append(details, detail)
-			}
-		}
-		if len(details) > 0 {
-			err := c.dao.SavePresentationDetail(details)
-			if err != nil {
-				beego.Error(err.Error())
-				c.ResponseJSON(map[string]interface{}{
-					"Status":  false,
-					"Message": err.Error(),
-				})
-			}
-		}
+		utils.LogError("操作错误：", err)
+		c.ResponseError(err)
 	}
-	c.ResponseJSON(map[string]interface{}{
-		"Status":  true,
-		"Message": "",
-	})
+	c.ResponseJSON("")
 }

controllers/bodycheck/wechat.go

@@ -1,177 +0,0 @@
-package bodycheck
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"io/ioutil"
-	"net/http"
-	"strings"
-
-	"github.com/astaxie/beego"
-	"github.com/astaxie/beego/config"
-)
-
-// WechatInfo 微信接入
-func (c *BodyCheckController) WechatInfo() {
-	// signature := c.GetString("signature")
-	// timestamp := c.GetString("timestamp")
-	// nonce := c.GetString("nonce")
-	echostr := c.GetString("echostr")
-	c.ResponseRaw([]byte(echostr))
-}
-
-// GetQrcodeURL 获取二维码信息
-func (c *BodyCheckController) GetQrcodeURL() {
-	EquipmentID := c.GetString("EquipmentId")
-	qrcodePrefix := beego.AppConfig.String("qrcodePrefix")
-	qrcode, err := c.weixin.GetTempStrQRCode(qrcodePrefix + EquipmentID)
-	if err != nil {
-		c.ResponseJson(map[string]interface{}{
-			"Status":  false,
-			"Message": err.Error(),
-		})
-	}
-	c.ResponseJson(map[string]interface{}{
-		"Status":    true,
-		"Message":   "",
-		"QrcodeUrl": qrcode,
-	})
-}
-
-// WxReceive 微信消息接收
-func (c *BodyCheckController) WxReceive() {
-	r := c.Ctx.Request
-	defer r.Body.Close()
-	con, _ := ioutil.ReadAll(r.Body) //获取post的数据
-	val, err := c.weixin.TransformMessage(string(con))
-	if err != nil {
-		beego.Error(err.Error())
-		c.ResponseRaw([]byte(""))
-	}
-
-	if val["MsgType"] == "event" {
-		qrcodePrefix := beego.AppConfig.String("qrcodePrefix")
-		if (val["Event"] == "subscribe" && strings.Contains(val["EventKey"], "qrscene_"+qrcodePrefix)) || val["Event"] == "SCAN" {
-			EquipmentID := strings.Split(val["EventKey"], qrcodePrefix)[1]
-			messagetxt, err := c.scanDo(val, EquipmentID)
-			if err != nil {
-				beego.Error(err.Error())
-				c.ResponseRaw([]byte(""))
-			}
-			c.ResponseRaw(messagetxt)
-		}
-	}
-	c.ResponseRaw([]byte(""))
-}
-
-func (c *BodyCheckController) scanDo(val map[string]string, EquipmentID string) ([]byte, error) {
-	if val["FromUserName"] == "" {
-		return nil, errors.New("openid为空")
-	}
-
-	user, err := c.weixin.GetUserDetail(val["FromUserName"])
-	if err != nil {
-		return nil, err
-	}
-
-	// 判断用户是否存在
-	getUser, err := c.dao.GetUserByOpenID(user["openid"].(string))
-	if err != nil {
-		return nil, err
-	}
-	name := user["nickname"].(string)
-	name = UnicodeEmojiCode(name)
-	user["nickname"] = name
-	if getUser == nil || getUser.Id < 1 {
-		// 新增用户
-		var newUser = model.CustomerUser{}
-		newUser.Username = name
-		newUser.WcNickname = name
-		sex := int(user["sex"].(float64))
-		if sex == 2 {
-			sex = 1
-		} else {
-			sex = 0
-		}
-		newUser.Sex = sex
-		newUser.OpenId = user["openid"].(string)
-		newUser.Icon = user["headimgurl"].(string)
-		newUser.UserType = 4
-		newUser.ActualBalance = "0.00"
-		newUser.GiftBalance = "0.00"
-		_, err = c.dao.SaveUser(newUser)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	type WechatInfo struct {
-		EquipmentId    string
-		WXID           int
-		WechatUserInfo map[string]interface{}
-	}
-	wxconf, _ := config.NewConfig("ini", "conf/wechat.conf")
-	user["wechataccount"] = user["openid"].(string)
-	user["wechatofficial"] = wxconf.String("appid")
-	var userinfo = WechatInfo{}
-	userinfo.EquipmentId = EquipmentID
-	userinfo.WechatUserInfo = user
-	userinfo.WXID = 1
-
-	apiPrefix := beego.AppConfig.String("postwechatInfo")
-
-	b, err := json.Marshal(userinfo)
-	if err != nil {
-		return nil, err
-	}
-
-	body := bytes.NewBuffer([]byte(b))
-	beego.Error(body)
-	res, err := http.Post(apiPrefix, "application/json;charset=utf-8", body)
-	if err != nil {
-		beego.Error(err)
-		return nil, err
-	}
-	result, err := ioutil.ReadAll(res.Body)
-	res.Body.Close()
-	if err != nil {
-		beego.Error(err)
-		return nil, err
-	}
-	var postResult struct {
-		Status  bool
-		Message string
-	}
-	if err = json.Unmarshal(result, &postResult); err != nil {
-		beego.Error(err)
-		return nil, err
-	}
-
-	if !postResult.Status {
-		beego.Error(postResult.Message)
-		return nil, errors.New(postResult.Message)
-	}
-
-	messagetxt, err := c.weixin.ResponseMessageText(user["openid"].(string), beego.AppConfig.String("followText"))
-	if err != nil {
-		beego.Error(err)
-		return nil, err
-	}
-	return messagetxt, nil
-}
-
-// UnicodeEmojiCode 过滤表情
-func UnicodeEmojiCode(s string) string {
-	ret := ""
-	rs := []rune(s)
-	for i := 0; i < len(rs); i++ {
-		if len(string(rs[i])) == 4 {
-			// u := `[\u` + strconv.FormatInt(int64(rs[i]), 16) + `]`
-			ret += ""
-		} else {
-			ret += string(rs[i])
-		}
-	}
-	return ret
-}

controllers/statistics/cardcoupon.go

@@ -1,6 +1,11 @@
 package statistics
 
-import "spaceofcheng/services/models/model"
+import (
+	"errors"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strconv"
+)
 
 // CardCouponStatistics 获取卡券统计数据
 func (c *StatisticsController) CardCouponStatistics() {
@@ -22,6 +27,72 @@ func (c *StatisticsController) CardCouponStatistics() {
 	c.ResponseJSON(list)
 }
 
+// CardCouponStatisticsExcel 获取卡券统计数据
+func (c *StatisticsController) CardCouponStatisticsExcel() {
+	caseids := c.GetString("caseid")
+	name := c.GetString("name")
+	ctype := c.GetString("ctype")
+
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
+
+	list, err := c.serv.CardCouponStatisticsExcel(caseids, ctype, name)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	excel, err := utils.NewTinyXLSXEngine()
+	if err != nil {
+		utils.LogError("初始化Excel服务失败: " + err.Error())
+		c.ResponseError(errors.New("初始化Excel服务失败"))
+	}
+
+	excel.SetCell(excel.InsertRow(), []string{
+		"案场",
+		"卡券名称",
+		"卡券类型",
+		"发送类型",
+		"价格",
+		"领取数",
+		"实际使用数",
+		"总费用",
+	})
+
+	for _, item := range list {
+		row := excel.InsertRow()
+		sendtype := ""
+		switch item.SendType {
+		case "system":
+			sendtype = "系统"
+			break
+		case "case":
+			sendtype = "案场"
+			break
+		case "channel":
+			sendtype = "渠道"
+			break
+		}
+		price, err := strconv.ParseFloat(item.Price, 64)
+		if err != nil {
+			c.ResponseError(errors.New("金额类型不正确！"))
+		}
+		amount := price * float64(item.UsedCount)
+
+		excel.SetCell(row, []string{
+			item.CaseName,
+			item.CName,
+			item.TypeName,
+			sendtype,
+			item.Price,
+			strconv.Itoa(item.SentCount),
+			strconv.Itoa(item.UsedCount),
+			strconv.FormatFloat(amount, 'f', -1, 64),
+		})
+	}
+	c.SaveToExcel("卡券统计列表.xlsx", excel)
+}
+
 // CardCouponUsedStatistics 获取卡券使用统计数据
 func (c *StatisticsController) CardCouponUsedStatistics() {
 	page, _ := c.GetInt("page")
@@ -46,6 +117,94 @@ func (c *StatisticsController) CardCouponUsedStatistics() {
 	c.ResponseJSON(list)
 }
 
+// CardCouponUsedStatisticsExcel 卡券使用导出
+func (c *StatisticsController) CardCouponUsedStatisticsExcel() {
+	caseids := c.GetString("caseid")
+	name := c.GetString("name")
+	receivetype := c.GetString("receivetype")
+	tel := c.GetString("tel")
+	begindate := c.GetString("begindate")
+	enddate := c.GetString("enddate")
+	status := c.GetString("status")
+
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
+	list, err := c.serv.CardCouponUsedStatisticsExcel(caseids, tel, name, receivetype, begindate, enddate, status)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	excel, err := utils.NewTinyXLSXEngine()
+	if err != nil {
+		utils.LogError("初始化Excel服务失败: " + err.Error())
+		c.ResponseError(errors.New("初始化Excel服务失败"))
+	}
+
+	excel.SetCell(excel.InsertRow(), []string{
+		"案场",
+		"卡券名称",
+		"使用商品",
+		"获取方式",
+		"微信昵称",
+		"手机号",
+		"有效期",
+		"获取时间",
+		"使用时间",
+		"状态",
+	})
+
+	for _, item := range list {
+		row := excel.InsertRow()
+		receivetype := ""
+		switch item.ReceivingType {
+		case "event":
+			receivetype = "系统"
+			break
+		case "case":
+			receivetype = "案场"
+			break
+		case "channel":
+			receivetype = "渠道"
+			break
+		case "give":
+			receivetype = "后台赠送"
+			break
+		}
+
+		verifystatus := ""
+		switch item.VerifyStatus {
+		case "useable":
+			verifystatus = "未使用"
+			break
+		case "used":
+			verifystatus = "已使用"
+			break
+		case "late":
+			verifystatus = "逾期核销"
+			break
+		case "expire":
+			verifystatus = "已失效"
+			break
+		}
+
+		excel.SetCell(row, []string{
+			item.CaseName,
+			item.CardCouponName,
+			item.TargetName,
+			receivetype,
+			item.CustomerName,
+			item.Phone,
+			item.EndDate.Format("2006-01-02 15:04:05"),
+			item.ReceiveDate.Format("2006-01-02 15:04:05"),
+			item.UsedDate.Format("2006-01-02 15:04:05"),
+			verifystatus,
+		})
+	}
+	c.SaveToExcel("卡券使用列表.xlsx", excel)
+}
+
 // CardCouponVerifyStatistics 获取卡券核销统计数据
 func (c *StatisticsController) CardCouponVerifyStatistics() {
 	page, _ := c.GetInt("page")
@@ -66,3 +225,72 @@ func (c *StatisticsController) CardCouponVerifyStatistics() {
 
 	c.ResponseJSON(list)
 }
+
+// CardCouponVerifyStatisticsExcel 卡券核销统计导出
+func (c *StatisticsController) CardCouponVerifyStatisticsExcel() {
+	caseids := c.GetString("caseid")
+	name := c.GetString("name")
+	tel := c.GetString("tel")
+	status := c.GetString("status")
+
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
+	list, err := c.serv.CardCouponVerifyStatisticsExcel(caseids, tel, name, status)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	excel, err := utils.NewTinyXLSXEngine()
+	if err != nil {
+		utils.LogError("初始化Excel服务失败: " + err.Error())
+		c.ResponseError(errors.New("初始化Excel服务失败"))
+	}
+
+	excel.SetCell(excel.InsertRow(), []string{
+		"案场",
+		"课程名称",
+		"课程时间",
+		"姓名",
+		"微信昵称",
+		"手机号",
+		"下单时间",
+		"核销时间",
+		"状态",
+	})
+
+	for _, item := range list {
+		row := excel.InsertRow()
+		verifystatus := ""
+		switch item.Status {
+		case "useable":
+			verifystatus = "未使用"
+			break
+		case "used":
+			verifystatus = "已使用"
+			break
+		case "late":
+			verifystatus = "逾期核销"
+			break
+		}
+
+		verifydate := ""
+		if !item.VerifyDate.IsZero() {
+			verifydate = item.VerifyDate.Format("2006-01-02 15:04:05")
+		}
+
+		excel.SetCell(row, []string{
+			item.CaseName,
+			item.CourseName,
+			item.BeginDate.Format("2006-01-02 15:04:05") + "~" + item.EndDate.Format("2006-01-02 15:04:05"),
+			item.Name,
+			item.CustomerName,
+			item.Phone,
+			item.CreateDate.Format("2006-01-02 15:04:05"),
+			verifydate,
+			verifystatus,
+		})
+	}
+	c.SaveToExcel("卡券核销列表.xlsx", excel)
+}

controllers/statistics/course.go

@@ -1,6 +1,11 @@
 package statistics
 
-import "spaceofcheng/services/models/model"
+import (
+	"errors"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strconv"
+)
 
 // GetCourseOrdersStatistics 获取课程订单统计数据
 func (c *StatisticsController) GetCourseOrdersStatistics() {
@@ -24,6 +29,56 @@ func (c *StatisticsController) GetCourseOrdersStatistics() {
 	c.ResponseJSON(ordersList)
 }
 
+// GetCourseOrdersStatisticsExcel 课程订单导出
+func (c *StatisticsController) GetCourseOrdersStatisticsExcel() {
+	caseids := c.GetString("caseid")
+	name := c.GetString("name")
+	typeid := c.GetString("typeid")
+	begindate := c.GetString("begindate")
+	enddate := c.GetString("enddate")
+
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
+	list, err := c.serv.GetCourseOrdersStatisticsExcel(typeid, caseids, name, begindate, enddate)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	excel, err := utils.NewTinyXLSXEngine()
+	if err != nil {
+		utils.LogError("初始化Excel服务失败: " + err.Error())
+		c.ResponseError(errors.New("初始化Excel服务失败"))
+	}
+
+	excel.SetCell(excel.InsertRow(), []string{
+		"订单编号",
+		"课程名称",
+		"案场",
+		"课程类别",
+		"课程时间",
+		"用户姓名",
+		"手机号",
+		"下单时间",
+	})
+
+	for _, item := range list {
+		row := excel.InsertRow()
+		excel.SetCell(row, []string{
+			item.OrdersNo,
+			item.CourseName,
+			item.CaseName,
+			item.LocationName,
+			item.BeginDate.Format("2006-01-02 15:04:05") + "~" + item.EndDate.Format("2006-01-02 15:04:05"),
+			item.CustomerName,
+			item.Phone,
+			item.CreateDate.Format("2006-01-02 15:04:05"),
+		})
+	}
+	c.SaveToExcel("课程订单列表.xlsx", excel)
+}
+
 // GetCourseStatistics 获取课程统计数据
 func (c *StatisticsController) GetCourseStatistics() {
 	page, _ := c.GetInt("page")
@@ -43,3 +98,58 @@ func (c *StatisticsController) GetCourseStatistics() {
 
 	c.ResponseJSON(ordersList)
 }
+
+// GetCourseStatisticsExcel 课程统计数据导出
+func (c *StatisticsController) GetCourseStatisticsExcel() {
+
+	caseids := c.GetString("caseid")
+	name := c.GetString("name")
+	typeid := c.GetString("typeid")
+
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
+	list, err := c.serv.GetCourseStatisticsExcel(typeid, caseids, name)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	excel, err := utils.NewTinyXLSXEngine()
+	if err != nil {
+		utils.LogError("初始化Excel服务失败: " + err.Error())
+		c.ResponseError(errors.New("初始化Excel服务失败"))
+	}
+
+	excel.SetCell(excel.InsertRow(), []string{
+		"案场",
+		"课程名称",
+		"课程类别",
+		"课程时间",
+		"课程价格",
+		"报名人数",
+		"核销人数",
+		"总费用",
+	})
+
+	for _, item := range list {
+		row := excel.InsertRow()
+		price, err := strconv.ParseFloat(item.Price, 64)
+		if err != nil {
+			c.ResponseError(errors.New("金额类型不正确！"))
+		}
+		amount := price * float64(item.JoinTotal)
+
+		excel.SetCell(row, []string{
+			item.CaseName,
+			item.CourseName,
+			item.LocationName,
+			item.BeginDate.Format("2006-01-02 15:04:05") + "~" + item.EndDate.Format("2006-01-02 15:04:05"),
+			item.Price,
+			strconv.Itoa(item.Total),
+			strconv.Itoa(item.JoinTotal),
+			strconv.FormatFloat(amount, 'f', -1, 64),
+		})
+	}
+	c.SaveToExcel("课程统计列表.xlsx", excel)
+}

controllers/statistics/dashboard.go

@@ -0,0 +1,45 @@
+package statistics
+
+import (
+	"strings"
+)
+
+// GetDashData 统计人员数据
+func (c *StatisticsController) GetDashData() {
+	caseids := c.GetString("caseids")
+	caseIDs := []string{}
+
+	if caseids != "" {
+		caseIDs = strings.Split(caseids, ",")
+	}
+
+	data, err := c.serv.StaDashboard(caseIDs)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(data)
+}
+
+// GetDashFilterCharts 统计过滤条件报表
+func (c *StatisticsController) GetDashFilterCharts() {
+	// 目前只支持 week, month 两种
+	staType := c.GetString("statype")
+	if staType == "" {
+		staType = "week"
+	}
+
+	caseids := c.GetString("caseids")
+	caseIDs := []string{}
+
+	if caseids != "" {
+		caseIDs = strings.Split(caseids, ",")
+	}
+
+	data, err := c.serv.GetStaFilterCharts(caseIDs, staType)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(data)
+}

controllers/statistics/goods.go

@@ -1,6 +1,11 @@
 package statistics
 
-import "spaceofcheng/services/models/model"
+import (
+	"errors"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strconv"
+)
 
 // GetGoodsStatistics 获取商品统计数据
 func (c *StatisticsController) GetGoodsStatistics() {
@@ -22,6 +27,58 @@ func (c *StatisticsController) GetGoodsStatistics() {
 	c.ResponseJSON(goodsList)
 }
 
+// GetGoodsStatisticsExcel 商品统计导出
+func (c *StatisticsController) GetGoodsStatisticsExcel() {
+	caseids := c.GetString("caseid")
+	name := c.GetString("name")
+	typeid := c.GetString("typeid")
+
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
+	list, err := c.serv.GetGoodsStatisticsExcel(caseids, typeid, name)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	excel, err := utils.NewTinyXLSXEngine()
+	if err != nil {
+		utils.LogError("初始化Excel服务失败: " + err.Error())
+		c.ResponseError(errors.New("初始化Excel服务失败"))
+	}
+
+	excel.SetCell(excel.InsertRow(), []string{
+		"案场",
+		"商品名称",
+		"分类",
+		"价格",
+		"下单数",
+		"完成数",
+		"总费用",
+	})
+
+	for _, item := range list {
+		row := excel.InsertRow()
+		price, err := strconv.ParseFloat(item.Price, 64)
+		if err != nil {
+			c.ResponseError(errors.New("金额类型不正确！"))
+		}
+		amount := price * float64(item.FinishTotal)
+
+		excel.SetCell(row, []string{
+			item.CaseName,
+			item.GoodsName,
+			item.TypeName,
+			item.Price,
+			strconv.Itoa(item.Total),
+			strconv.Itoa(item.FinishTotal),
+			strconv.FormatFloat(amount, 'f', -1, 64),
+		})
+	}
+	c.SaveToExcel("商品统计列表.xlsx", excel)
+}
+
 // GetGoodsOrdersStatistics 获取商品订单统计数据
 func (c *StatisticsController) GetGoodsOrdersStatistics() {
 	page, _ := c.GetInt("page")
@@ -43,3 +100,84 @@ func (c *StatisticsController) GetGoodsOrdersStatistics() {
 
 	c.ResponseJSON(goodsList)
 }
+
+// GetGoodsOrdersStatisticsExcel 商品订单统计导出
+func (c *StatisticsController) GetGoodsOrdersStatisticsExcel() {
+	caseids := c.GetString("caseid")
+	status := c.GetString("status")
+	usertype := c.GetString("usertype")
+	begindate := c.GetString("begindate")
+	enddate := c.GetString("enddate")
+
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
+	list, err := c.serv.GetGoodsOrdersStatisticsExcel(status, usertype, caseids, begindate, enddate)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	excel, err := utils.NewTinyXLSXEngine()
+	if err != nil {
+		utils.LogError("初始化Excel服务失败: " + err.Error())
+		c.ResponseError(errors.New("初始化Excel服务失败"))
+	}
+
+	excel.SetCell(excel.InsertRow(), []string{
+		"订单编号",
+		"案场",
+		"用户类型",
+		"下单时间",
+		"订单状态",
+		"商品",
+		"数量",
+		"金额",
+		"桌位",
+		"下单人",
+		"电话",
+	})
+
+	for _, item := range list {
+		row := excel.InsertRow()
+		usertype := ""
+		switch item.UserType {
+		case "customer":
+			usertype = "用户"
+			break
+		case "sales":
+			usertype = "销售"
+			break
+		case "manager":
+			usertype = "主管"
+			break
+		}
+
+		orderStatus := ""
+		if item.Status == 1 {
+			orderStatus = "已完成"
+		} else {
+			orderStatus = "已取消"
+		}
+		for _, detail := range item.Details {
+			name := detail.GoodsName
+			if detail.SpecName != "" {
+				name = name + "(" + detail.SpecName + ")"
+			}
+			excel.SetCell(row, []string{
+				item.OrdersNo,
+				item.CaseName,
+				usertype,
+				item.CreateDate.Format("2006-01-02 15:04:05"),
+				orderStatus,
+				name,
+				strconv.Itoa(detail.Number),
+				item.AreaName + item.TableNo,
+				item.CustomerName,
+				item.Phone,
+			})
+		}
+
+	}
+	c.SaveToExcel("商品订单统计列表.xlsx", excel)
+}

controllers/wechat.go

@@ -1,12 +1,175 @@
 package controllers
 
 import (
+	"bytes"
+	"encoding/json"
 	"errors"
+	"io/ioutil"
+	"net/http"
 	"net/url"
 	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service/customer"
 	"spaceofcheng/services/utils"
+	"strings"
+
+	"github.com/astaxie/beego"
 )
 
+// WechatInfo 微信接入
+func (c *BaseController) WechatInfo() {
+	// signature := c.GetString("signature")
+	// timestamp := c.GetString("timestamp")
+	// nonce := c.GetString("nonce")
+	echostr := c.GetString("echostr")
+	c.ResponseRaw([]byte(echostr))
+}
+
+// GetQrcodeURL 获取二维码信息
+func (c *BaseController) GetQrcodeURL() {
+	EquipmentID := c.GetString("EquipmentId")
+	qrcodePrefix := beego.AppConfig.String("qrcodePrefix")
+	org := c.Context.Get("org").(model.SysOrg)
+
+	qrcode, err := utils.WxClientFor(org.OrgId).GetTempStrQRCode(qrcodePrefix + EquipmentID)
+	if err != nil {
+		utils.LogError("获取二维码失败！")
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(map[string]interface{}{
+		"QrcodeUrl": qrcode,
+	})
+}
+
+// WxReceive
+func (c *BaseController) WxReceive() {
+	org := c.Context.Get("org").(model.SysOrg)
+	wechat := utils.WxClientFor(org.OrgId)
+	r := c.Ctx.Request
+	defer r.Body.Close()
+	con, _ := ioutil.ReadAll(r.Body) //获取post的数据
+	val, err := wechat.TransformMessage(string(con))
+	if err != nil {
+		beego.Error(err.Error())
+		c.ResponseRaw([]byte(""))
+	}
+
+	if val["MsgType"] == "event" {
+		qrcodePrefix := beego.AppConfig.String("qrcodePrefix")
+		if (val["Event"] == "subscribe" && strings.Contains(val["EventKey"], "qrscene_"+qrcodePrefix)) || val["Event"] == "SCAN" {
+			EquipmentID := strings.Split(val["EventKey"], qrcodePrefix)[1]
+			messagetxt, err := c.scanDo(val, EquipmentID)
+			if err != nil {
+				beego.Error(err.Error())
+				c.ResponseRaw([]byte(""))
+			}
+			c.ResponseRaw(messagetxt)
+		}
+	}
+	c.ResponseRaw([]byte(""))
+}
+
+func (c *BaseController) scanDo(val map[string]string, EquipmentID string) ([]byte, error) {
+	org := c.Context.Get("org").(model.SysOrg)
+	wechat := utils.WxClientFor(org.OrgId)
+
+	if val["FromUserName"] == "" {
+		return nil, errors.New("openid为空")
+	}
+
+	user, err := wechat.GetUserDetail(val["FromUserName"])
+	if err != nil {
+		return nil, err
+	}
+
+	var customerserv = customer.NewCustomerServ(c.Context)
+
+	// 判断用户是否存在
+	getUser, err := customerserv.GetCustUserByOpenID(user["openid"].(string))
+	if err != nil {
+		return nil, err
+	}
+	name := user["nickname"].(string)
+	name = UnicodeEmojiCode(name)
+	user["nickname"] = name
+	if getUser == nil || getUser.CustomerId != "" {
+		// 新增用户
+		_, err := customerserv.SaveNewCustomer(user, "", "", "", "")
+		if err != nil {
+			utils.LogError("用户保存失败：", err)
+			return nil, err
+		}
+	}
+
+	type WechatInfo struct {
+		EquipmentId    string
+		WXID           int
+		WechatUserInfo map[string]interface{}
+	}
+	appid := wechat.GetAppID()
+	user["wechataccount"] = user["openid"].(string)
+	user["wechatofficial"] = appid
+	var userinfo = WechatInfo{}
+	userinfo.EquipmentId = EquipmentID
+	userinfo.WechatUserInfo = user
+	userinfo.WXID = 1
+
+	apiPrefix := beego.AppConfig.String("postwechatInfo")
+
+	b, err := json.Marshal(userinfo)
+	if err != nil {
+		return nil, err
+	}
+
+	body := bytes.NewBuffer([]byte(b))
+
+	res, err := http.Post(apiPrefix, "application/json;charset=utf-8", body)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+	result, err := ioutil.ReadAll(res.Body)
+	res.Body.Close()
+	if err != nil {
+		utils.LogError("发送消息失败：", err)
+		return nil, err
+	}
+	var postResult struct {
+		Status  bool
+		Message string
+	}
+	if err = json.Unmarshal(result, &postResult); err != nil {
+		utils.LogError("发送消息失败：", err)
+		return nil, err
+	}
+
+	if !postResult.Status {
+		beego.Error(postResult.Message)
+		return nil, errors.New(postResult.Message)
+	}
+
+	messagetxt, err := wechat.ResponseMessageText(user["openid"].(string), beego.AppConfig.String("followText"))
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+	return messagetxt, nil
+}
+
+// UnicodeEmojiCode 过滤表情
+func UnicodeEmojiCode(s string) string {
+	ret := ""
+	rs := []rune(s)
+	for i := 0; i < len(rs); i++ {
+		if len(string(rs[i])) == 4 {
+			// u := `[\u` + strconv.FormatInt(int64(rs[i]), 16) + `]`
+			ret += ""
+		} else {
+			ret += string(rs[i])
+		}
+	}
+	return ret
+}
+
 // GetWxJsSDKSignature 获取 微信 jssdk 签名
 func (c *BaseController) GetWxJsSDKSignature() {
 	org := c.Context.Get("org").(model.SysOrg)

log/common.log

@@ -73,3 +73,276 @@
 2018/09/16 17:39:13 [E] 用户没有设置默认案场
 2018/09/16 18:43:58 [E] 用户没有设置默认案场
 2018/09/16 18:43:58 [E] 用户没有设置默认案场
+2018/09/16 19:21:38 [E] 用户没有设置默认案场
+2018/09/16 19:21:38 [E] 用户没有设置默认案场
+2018/09/16 19:23:09 [E] 用户没有设置默认案场
+2018/09/16 19:23:09 [E] 用户没有设置默认案场
+2018/09/16 19:23:14 [E] 用户没有设置默认案场
+2018/09/16 19:23:15 [E] 用户没有设置默认案场
+2018/09/16 19:24:16 [E] 用户没有设置默认案场
+2018/09/16 19:24:16 [E] 用户没有设置默认案场
+2018/09/16 19:24:16 [E] 用户没有设置默认案场
+2018/09/16 19:25:07 [E] 用户没有设置默认案场
+2018/09/16 19:25:07 [E] 用户没有设置默认案场
+2018/09/16 19:25:07 [E] 用户没有设置默认案场
+2018/09/16 19:26:15 [E] 用户没有设置默认案场
+2018/09/16 19:26:42 [E] 用户没有设置默认案场
+2018/09/16 19:26:45 [E] 用户没有设置默认案场
+2018/09/16 19:26:45 [E] 用户没有设置默认案场
+2018/09/16 19:27:06 [E] 用户没有设置默认案场
+2018/09/16 19:27:06 [E] 用户没有设置默认案场
+2018/09/16 19:29:45 [E] 用户没有设置默认案场
+2018/09/16 19:30:00 [E] 用户没有设置默认案场
+2018/09/16 19:30:00 [E] 用户没有设置默认案场
+2018/09/16 19:30:26 [E] 用户没有设置默认案场
+2018/09/16 19:33:11 [E] 用户没有设置默认案场
+2018/09/16 19:34:19 [E] 用户没有设置默认案场
+2018/09/16 19:35:56 [E] 用户没有设置默认案场
+2018/09/16 19:36:33 [E] 用户没有设置默认案场
+2018/09/16 19:37:06 [E] 用户没有设置默认案场
+2018/09/16 19:37:17 [E] 用户没有设置默认案场
+2018/09/16 19:37:19 [E] 用户没有设置默认案场
+2018/09/16 19:37:20 [E] 用户没有设置默认案场
+2018/09/16 19:37:21 [E] 用户没有设置默认案场
+2018/09/16 19:37:36 [E] 用户没有设置默认案场
+2018/09/16 19:37:46 [E] 用户没有设置默认案场
+2018/09/16 19:37:46 [E] 用户没有设置默认案场
+2018/09/16 19:38:13 [E] 用户没有设置默认案场
+2018/09/16 19:38:24 [E] 用户没有设置默认案场
+2018/09/16 19:38:31 [E] 用户没有设置默认案场
+2018/09/16 19:38:31 [E] 用户没有设置默认案场
+2018/09/16 19:38:33 [E] 用户没有设置默认案场
+2018/09/16 19:38:38 [E] 用户没有设置默认案场
+2018/09/16 19:38:43 [E] 用户没有设置默认案场
+2018/09/16 19:38:43 [E] 用户没有设置默认案场
+2018/09/16 19:38:56 [E] 用户没有设置默认案场
+2018/09/16 19:39:00 [E] 用户没有设置默认案场
+2018/09/16 19:41:09 [E] 用户没有设置默认案场
+2018/09/16 19:41:48 [E] 用户没有设置默认案场
+2018/09/16 19:41:48 [E] 用户没有设置默认案场
+2018/09/16 19:43:37 [E] 用户没有设置默认案场
+2018/09/16 19:43:38 [E] 用户没有设置默认案场
+2018/09/16 19:43:39 [E] 用户没有设置默认案场
+2018/09/16 19:43:40 [E] 用户没有设置默认案场
+2018/09/16 19:43:40 [E] 用户没有设置默认案场
+2018/09/16 19:43:41 [E] 用户没有设置默认案场
+2018/09/16 19:43:41 [E] 用户没有设置默认案场
+2018/09/16 19:43:42 [E] 用户没有设置默认案场
+2018/09/16 19:43:44 [E] 用户没有设置默认案场
+2018/09/16 19:43:44 [E] 用户没有设置默认案场
+2018/09/16 19:43:50 [E] 用户没有设置默认案场
+2018/09/16 19:43:52 [E] 用户没有设置默认案场
+2018/09/16 19:43:53 [E] 用户没有设置默认案场
+2018/09/16 19:43:54 [E] 用户没有设置默认案场
+2018/09/16 19:43:55 [E] 用户没有设置默认案场
+2018/09/16 19:44:13 [E] 用户没有设置默认案场
+2018/09/16 19:44:13 [E] 用户没有设置默认案场
+2018/09/16 19:44:14 [E] 用户没有设置默认案场
+2018/09/16 19:45:09 [E] 用户没有设置默认案场
+2018/09/16 19:45:44 [E] 用户没有设置默认案场
+2018/09/16 19:45:47 [E] 用户没有设置默认案场
+2018/09/16 19:45:50 [E] 用户没有设置默认案场
+2018/09/16 19:46:15 [E] 用户没有设置默认案场
+2018/09/16 19:46:15 [E] 用户没有设置默认案场
+2018/09/16 20:00:54 [E] 用户没有设置默认案场
+2018/09/16 20:02:25 [E] 用户没有设置默认案场
+2018/09/16 20:04:08 [E] 用户没有设置默认案场
+2018/09/16 20:06:11 [E] 用户没有设置默认案场
+2018/09/16 20:06:17 [E] 用户没有设置默认案场
+2018/09/16 20:08:16 [E] 用户没有设置默认案场
+2018/09/16 20:13:41 [E] 用户没有设置默认案场
+2018/09/16 20:13:45 [E] 用户没有设置默认案场
+2018/09/16 20:13:45 [E] 用户没有设置默认案场
+2018/09/16 20:15:55 [E] 用户没有设置默认案场
+2018/09/16 20:15:55 [E] 用户没有设置默认案场
+2018/09/16 20:15:58 [E] 用户没有设置默认案场
+2018/09/16 20:15:58 [E] 用户没有设置默认案场
+2018/09/16 20:16:07 [E] 用户没有设置默认案场
+2018/09/16 20:16:07 [E] 用户没有设置默认案场
+2018/09/16 20:16:08 [E] 用户没有设置默认案场
+2018/09/16 20:16:31 [E] 用户没有设置默认案场
+2018/09/16 20:16:36 [E] 用户没有设置默认案场
+2018/09/16 20:16:36 [E] 用户没有设置默认案场
+2018/09/16 20:16:37 [E] 用户没有设置默认案场
+2018/09/16 20:18:25 [E] 用户没有设置默认案场
+2018/09/16 20:18:25 [E] 用户没有设置默认案场
+2018/09/16 20:22:33 [E] 用户没有设置默认案场
+2018/09/16 20:34:05 [E] 用户没有设置默认案场
+2018/09/16 20:36:10 [E] 用户没有设置默认案场
+2018/09/16 20:38:03 [E] 用户没有设置默认案场
+2018/09/16 20:38:03 [E] 用户没有设置默认案场
+2018/09/16 20:42:12 [E] 用户没有设置默认案场
+2018/09/16 20:42:12 [E] 用户没有设置默认案场
+2018/09/16 20:42:45 [E] 用户没有设置默认案场
+2018/09/16 20:42:45 [E] 用户没有设置默认案场
+2018/09/16 20:44:07 [E] 用户没有设置默认案场
+2018/09/16 20:44:07 [E] 用户没有设置默认案场
+2018/09/16 20:46:02 [E] 用户没有设置默认案场
+2018/09/16 20:46:20 [E] 用户没有设置默认案场
+2018/09/16 20:46:46 [E] 用户没有设置默认案场
+2018/09/16 20:47:04 [E] 用户没有设置默认案场
+2018/09/16 20:47:13 [E] 用户没有设置默认案场
+2018/09/16 20:47:18 [E] 用户没有设置默认案场
+2018/09/16 20:47:18 [E] 用户没有设置默认案场
+2018/09/16 20:48:47 [E] 用户没有设置默认案场
+2018/09/16 21:00:31 [E] 用户没有设置默认案场
+2018/09/16 21:00:31 [E] 用户没有设置默认案场
+2018/09/16 21:00:37 [E] 用户没有设置默认案场
+2018/09/16 21:00:37 [E] 用户没有设置默认案场
+2018/09/16 21:01:37 [E] 用户没有设置默认案场
+2018/09/16 21:01:37 [E] 用户没有设置默认案场
+2018/09/16 21:01:37 [E] 用户没有设置默认案场
+2018/09/16 21:01:41 [E] 用户没有设置默认案场
+2018/09/16 21:01:41 [E] 用户没有设置默认案场
+2018/09/16 21:01:41 [E] 用户没有设置默认案场
+2018/09/16 21:01:45 [E] 用户没有设置默认案场
+2018/09/16 21:01:45 [E] 用户没有设置默认案场
+2018/09/16 21:01:45 [E] 用户没有设置默认案场
+2018/09/16 21:05:12 [E] 用户没有设置默认案场
+2018/09/16 21:05:12 [E] 用户没有设置默认案场
+2018/09/16 21:05:19 [E] 用户没有设置默认案场
+2018/09/16 21:05:19 [E] 用户没有设置默认案场
+2018/09/16 21:10:23 [E] 用户没有设置默认案场
+2018/09/16 21:10:23 [E] 用户没有设置默认案场
+2018/09/16 21:10:26 [E] 用户没有设置默认案场
+2018/09/16 21:10:26 [E] 用户没有设置默认案场
+2018/09/16 21:15:42 [E] 用户没有设置默认案场
+2018/09/16 21:15:42 [E] 用户没有设置默认案场
+2018/09/16 21:16:22 [E] 用户没有设置默认案场
+2018/09/16 21:16:22 [E] 用户没有设置默认案场
+2018/09/16 21:16:35 [E] 用户没有设置默认案场
+2018/09/16 21:16:36 [E] 用户没有设置默认案场
+2018/09/16 21:21:26 [E] 用户没有设置默认案场
+2018/09/16 21:21:26 [E] 用户没有设置默认案场
+2018/09/16 21:21:35 [E] 用户没有设置默认案场
+2018/09/16 21:21:35 [E] 用户没有设置默认案场
+2018/09/16 21:23:58 [E] 用户没有设置默认案场
+2018/09/16 21:23:58 [E] 用户没有设置默认案场
+2018/09/16 21:24:05 [E] 用户没有设置默认案场
+2018/09/16 21:24:05 [E] 用户没有设置默认案场
+2018/09/16 21:29:34 [E] 用户没有设置默认案场
+2018/09/16 21:29:34 [E] 用户没有设置默认案场
+2018/09/16 21:29:38 [E] 用户没有设置默认案场
+2018/09/16 21:29:38 [E] 用户没有设置默认案场
+2018/09/16 21:31:47 [E] 用户没有设置默认案场
+2018/09/16 21:33:12 [E] 用户没有设置默认案场
+2018/09/16 21:33:12 [E] 用户没有设置默认案场
+2018/09/16 21:33:13 [E] 用户没有设置默认案场
+2018/09/16 21:33:15 [E] 用户没有设置默认案场
+2018/09/16 21:33:15 [E] 用户没有设置默认案场
+2018/09/16 21:33:16 [E] 用户没有设置默认案场
+2018/09/16 21:33:17 [E] 用户没有设置默认案场
+2018/09/16 21:33:18 [E] 用户没有设置默认案场
+2018/09/16 21:33:19 [E] 用户没有设置默认案场
+2018/09/16 21:33:20 [E] 用户没有设置默认案场
+2018/09/16 21:33:34 [E] 用户没有设置默认案场
+2018/09/16 21:33:35 [E] 用户没有设置默认案场
+2018/09/16 21:33:36 [E] 用户没有设置默认案场
+2018/09/16 21:33:36 [E] 用户没有设置默认案场
+2018/09/16 21:33:39 [E] 用户没有设置默认案场
+2018/09/16 21:33:39 [E] 用户没有设置默认案场
+2018/09/16 21:33:39 [E] 用户没有设置默认案场
+2018/09/16 21:33:39 [E] 用户没有设置默认案场
+2018/09/16 21:33:40 [E] 用户没有设置默认案场
+2018/09/16 21:33:40 [E] 用户没有设置默认案场
+2018/09/16 21:33:41 [E] 用户没有设置默认案场
+2018/09/16 21:33:41 [E] 用户没有设置默认案场
+2018/09/16 21:33:42 [E] 用户没有设置默认案场
+2018/09/16 21:33:43 [E] 用户没有设置默认案场
+2018/09/16 21:33:43 [E] 用户没有设置默认案场
+2018/09/16 21:33:43 [E] 用户没有设置默认案场
+2018/09/16 21:33:44 [E] 用户没有设置默认案场
+2018/09/16 21:33:44 [E] 用户没有设置默认案场
+2018/09/16 21:33:44 [E] 用户没有设置默认案场
+2018/09/16 21:33:52 [E] 用户没有设置默认案场
+2018/09/16 21:33:57 [E] 用户没有设置默认案场
+2018/09/16 21:37:56 [E] 用户没有设置默认案场
+2018/09/16 21:37:59 [E] 用户没有设置默认案场
+2018/09/16 21:39:29 [E] 用户没有设置默认案场
+2018/09/16 21:39:29 [E] 用户没有设置默认案场
+2018/09/16 21:40:26 [E] 用户没有设置默认案场
+2018/09/16 21:40:26 [E] 用户没有设置默认案场
+2018/09/16 21:41:01 [E] 用户没有设置默认案场
+2018/09/16 21:41:01 [E] 用户没有设置默认案场
+2018/09/16 21:41:11 [E] 用户没有设置默认案场
+2018/09/16 21:41:48 [E] 用户没有设置默认案场
+2018/09/16 21:41:59 [E] 用户没有设置默认案场
+2018/09/16 21:42:01 [E] 用户没有设置默认案场
+2018/09/16 21:47:50 [E] 用户没有设置默认案场
+2018/09/16 21:47:51 [E] 解密 Base64 字串失败: illegal base64 data at input byte 0
+2018/09/16 21:47:51 [E] 获取组织信息失败: 没有查询到机构信息
+2018/09/16 21:48:05 [E] 用户没有设置默认案场
+2018/09/16 21:48:05 [E] 用户没有设置默认案场
+2018/09/16 21:48:09 [E] 解密 Base64 字串失败: illegal base64 data at input byte 0
+2018/09/16 21:48:09 [E] 获取组织信息失败: 没有查询到机构信息
+2018/09/16 21:49:17 [E] 用户没有设置默认案场
+2018/09/16 21:49:17 [E] 用户没有设置默认案场
+2018/09/16 21:51:16 [E] 用户没有设置默认案场
+2018/09/16 21:51:16 [E] 用户没有设置默认案场
+2018/09/16 21:52:15 [E] 用户没有设置默认案场
+2018/09/16 21:52:15 [E] 用户没有设置默认案场
+2018/09/16 21:58:57 [E] 用户没有设置默认案场
+2018/09/16 21:58:57 [E] 用户没有设置默认案场
+2018/09/16 21:59:01 [E] 用户没有设置默认案场
+2018/09/16 21:59:01 [E] 用户没有设置默认案场
+2018/09/16 22:01:01 [E] 用户没有设置默认案场
+2018/09/16 22:01:10 [E] 用户没有设置默认案场
+2018/09/16 22:02:34 [E] 用户没有设置默认案场
+2018/09/16 22:02:34 [E] 用户没有设置默认案场
+2018/09/16 22:03:01 [E] 用户没有设置默认案场
+2018/09/16 22:03:05 [E] 用户没有设置默认案场
+2018/09/16 22:03:05 [E] 用户没有设置默认案场
+2018/09/16 22:07:01 [E] 用户没有设置默认案场
+2018/09/16 22:07:01 [E] 用户没有设置默认案场
+2018/09/16 22:07:05 [E] 用户没有设置默认案场
+2018/09/16 22:07:05 [E] 用户没有设置默认案场
+2018/09/16 22:12:51 [E] 用户没有设置默认案场
+2018/09/16 22:18:09 [E] 用户没有设置默认案场
+2018/09/16 22:18:13 [E] 用户没有设置默认案场
+2018/09/16 22:18:13 [E] 用户没有设置默认案场
+2018/09/16 22:18:17 [E] 用户没有设置默认案场
+2018/09/16 22:18:17 [E] 用户没有设置默认案场
+2018/09/16 22:19:23 [E] 用户没有设置默认案场
+2018/09/16 22:19:36 [E] 用户没有设置默认案场
+2018/09/16 22:20:28 [E] 用户没有设置默认案场
+2018/09/16 22:20:32 [E] 用户没有设置默认案场
+2018/09/16 22:20:33 [E] 用户没有设置默认案场
+2018/09/16 22:26:31 [E] 用户没有设置默认案场
+2018/09/16 22:26:54 [E] 用户没有设置默认案场
+2018/09/16 22:26:54 [E] 用户没有设置默认案场
+2018/09/16 22:27:39 [E] 用户没有设置默认案场
+2018/09/16 22:27:48 [E] 用户没有设置默认案场
+2018/09/16 22:27:49 [E] 用户没有设置默认案场
+2018/09/16 22:28:15 [E] 用户没有设置默认案场
+2018/09/16 22:28:15 [E] 用户没有设置默认案场
+2018/09/16 22:28:15 [E] 用户没有设置默认案场
+2018/09/16 22:28:57 [E] 用户没有设置默认案场
+2018/09/16 22:28:57 [E] 用户没有设置默认案场
+2018/09/16 22:29:11 [E] 用户没有设置默认案场
+2018/09/16 22:29:12 [E] 用户没有设置默认案场
+2018/09/16 22:29:36 [E] 用户没有设置默认案场
+2018/09/16 22:29:36 [E] 用户没有设置默认案场
+2018/09/16 22:29:36 [E] 用户没有设置默认案场
+2018/09/16 22:30:14 [E] 用户没有设置默认案场
+2018/09/16 22:30:14 [E] 用户没有设置默认案场
+2018/09/16 22:30:18 [E] 用户没有设置默认案场
+2018/09/16 22:30:55 [E] 用户没有设置默认案场
+2018/09/16 22:30:55 [E] 用户没有设置默认案场
+2018/09/16 22:31:13 [E] 用户没有设置默认案场
+2018/09/16 22:31:15 [E] 用户没有设置默认案场
+2018/09/16 22:31:15 [E] 用户没有设置默认案场
+2018/09/16 22:31:57 [E] 用户没有设置默认案场
+2018/09/16 22:31:57 [E] 用户没有设置默认案场
+2018/09/16 22:32:21 [E] 用户没有设置默认案场
+2018/09/16 22:32:21 [E] 用户没有设置默认案场
+2018/09/16 22:32:22 [E] 用户没有设置默认案场
+2018/09/16 22:32:27 [E] 用户没有设置默认案场
+2018/09/16 22:32:56 [E] 用户没有设置默认案场
+2018/09/16 22:32:56 [E] 用户没有设置默认案场
+2018/09/16 22:33:10 [E] 用户没有设置默认案场
+2018/09/16 22:33:16 [E] 用户没有设置默认案场
+2018/09/16 22:33:58 [E] 用户没有设置默认案场
+2018/09/16 23:14:52 [E] 用户没有设置默认案场
+2018/09/16 23:15:52 [E] 用户没有设置默认案场
+2018/09/16 23:15:55 [E] 用户没有设置默认案场
+2018/09/16 23:15:55 [E] 用户没有设置默认案场

models/bodycheck/bodycheck.go

@@ -1,10 +1,10 @@
 package bodycheck
 
 import (
+	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"
-	"time"
 
 	"github.com/go-xorm/xorm"
 )
@@ -27,7 +27,7 @@ func NewDAO(ctx *utils.Context) *DAO {
 func (m *DAO) GetBodyCheckByUser(userID string) ([]model.TaBodyCheck, error) {
 	var bodychecks []model.TaBodyCheck
 	var err error
-	err = m.db.Where("user_id=?", userID).And("status=?", 1).Desc("create_date").Find(&bodychecks)
+	err = m.db.Where("user_id=?", userID).And("status=?", models.STATUS_NORMAL).Desc("create_date").Find(&bodychecks)
 	return bodychecks, err
 }
 
@@ -41,7 +41,7 @@ func (m *DAO) GetCheckSpecs() ([]model.TdCheckSpec, error) {
 // GetCheckByUserAndEquipmentID 根据用户与设备ID获取体检信息
 func (m *DAO) GetCheckByUserAndEquipmentID(userID string, EquipmentID string) (*model.TaBodyCheck, error) {
 	var check []model.TaBodyCheck
-	err := m.db.Where("user_id=?", userID).And("equipment_id=?", EquipmentID).And("status=?", 1).Desc("create_date").Find(&check)
+	err := m.db.Where("user_id=?", userID).And("equipment_id=?", EquipmentID).And("status=?", models.STATUS_NORMAL).Desc("create_date").Find(&check)
 	if err != nil {
 		return nil, err
 	}
@@ -53,41 +53,21 @@ func (m *DAO) GetCheckByUserAndEquipmentID(userID string, EquipmentID string) (*
 
 // SaveBodyCheckInfo 用户体检信息新增
 func (m *DAO) SaveBodyCheckInfo(checkNew model.TaBodyCheck) (*model.TaBodyCheck, error) {
-	checkNew.Status = 1
+	checkNew.Status = models.STATUS_NORMAL
+	checkNew.Id = utils.GetGUID()
 	// checkNew.CreateDate = time.Now()
 	_, err := m.db.Insert(&checkNew)
 	return &checkNew, err
 }
 
-// SaveUser 新增用户信息
-func (m *DAO) SaveUser(user model.TaCustomer) (*model.TaCustomer, error) {
-	user.CreateDate = time.Now()
-	_, err := m.db.Insert(&user)
-	return &user, err
-}
-
 // GetCaseEquipment 获取设备案场信息
 func (m *DAO) GetCaseEquipment(EquipmentID string) (*model.TaCaseEquipment, error) {
 	var caseEquipment model.TaCaseEquipment
 
-	_, err := m.db.Where("equipment_id=?", EquipmentID).And("status=?", 1).Get(&caseEquipment)
+	_, err := m.db.Where("equipment_id=?", EquipmentID).And("status=?", models.STATUS_NORMAL).Get(&caseEquipment)
 	return &caseEquipment, err
 }
 
-// GetUserByOpenID 根据openid获取用户信息
-func (m *DAO) GetUserByOpenID(openid string) (*model.TaCustomer, error) {
-	var user model.TaCustomer
-	_, err := m.db.Where("open_id=?", openid).Get(&user)
-	return &user, err
-}
-
-// GetCustomerByID 根据客户ID 获取用户信息
-func (m *DAO) GetCustomerByID(id string) (*model.TaCustomer, error) {
-	var cust model.TaCustomer
-	_, err := m.db.Where("customer_id=?", id).Get(&cust)
-	return &cust, err
-}
-
 type Presentation struct {
 	model.TaPresentation `xorm:"extends"`
 	TypeName             string
@@ -95,9 +75,9 @@ type Presentation struct {
 }
 
 // GetPresentationByCheckID 根据体检ID获取项目信息
-func (m *DAO) GetPresentationByCheckID(checkID int) ([]Presentation, error) {
+func (m *DAO) GetPresentationByCheckID(checkID string) ([]Presentation, error) {
 	var presentations []Presentation
-	sql := `select a.*,b.type_name from ta_presentation a inner join td_check_type b on a.check_type=b.id where a.check_id=` + strconv.Itoa(checkID)
+	sql := `select a.*,b.type_name from ta_presentation a inner join td_check_type b on a.check_type=b.id where a.check_id='` + checkID + `'`
 
 	err := m.db.Sql(sql).Find(&presentations)
 	if err != nil {
@@ -117,21 +97,22 @@ func (m *DAO) GetPresentationByCheckID(checkID int) ([]Presentation, error) {
 }
 
 // GetDetailsByPresentID 根据项目ID获取详情
-func (m *DAO) GetDetailsByPresentID(ID int) ([]model.TaPresentationDetail, error) {
+func (m *DAO) GetDetailsByPresentID(ID string) ([]model.TaPresentationDetail, error) {
 	var details []model.TaPresentationDetail
 	err := m.db.Where("presentation_id=?", ID).Find(&details)
 	return details, err
 }
 
 // GetPresentation 获取体检项目信息
-func (m *DAO) GetPresentation(checkID, typeID int) (*model.TaPresentation, error) {
+func (m *DAO) GetPresentation(checkID string, typeID int) (*model.TaPresentation, error) {
 	var presentation model.TaPresentation
-	_, err := m.db.Where("check_id=?", checkID).And("check_type=?", typeID).Get(&presentation)
+	_, err := m.db.Where("check_id=?", checkID).And("check_type='" + strconv.Itoa(typeID) + "'").Get(&presentation)
 	return &presentation, err
 }
 
 // SavePresentation 新增体检项目信息
 func (m *DAO) SavePresentation(info model.TaPresentation) (*model.TaPresentation, error) {
+	info.Id = utils.GetGUID()
 	_, err := m.db.Insert(&info)
 	return &info, err
 }
@@ -154,8 +135,8 @@ func (m *DAO) SavePresentationDetail(details []model.TaPresentationDetail) error
 }
 
 // DeletePresentionDetail 根据项目ID删除明细信息
-func (m *DAO) DeletePresentionDetail(ID int) error {
-	sql := "delete from ta_presentation_detail where presentation_id=" + strconv.Itoa(ID)
-	_, err := m.db.Exec(sql)
+func (m *DAO) DeletePresentionDetail(ID string) error {
+	sql := "delete from ta_presentation_detail where presentation_id=?"
+	_, err := m.db.Exec(sql, ID)
 	return err
 }

models/constant.go

@@ -12,6 +12,9 @@ const (
 	STATUS_NORMAL
 )
 
+// 过期
+const STATUS_EXPIRE = 9
+
 // 映射数据库的布尔型
 const (
 	BOOL_FALSE = 0

models/luckdraw/luckdraw.go

@@ -1,6 +1,7 @@
 package luckdraw
 
 import (
+	"errors"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
@@ -10,28 +11,20 @@ import (
 	"github.com/go-xorm/xorm"
 )
 
-const (
-	StatusNormal = 1
-)
-
-// DAO 当前数据库操作对象
-type DAO struct {
+// LuckDrawDao 当前数据库操作对象
+type LuckDrawDao struct {
 	ctx *utils.Context
 	db  *xorm.Session
 }
 
 // NewDAO 初始化DAO
-func NewDAO(ctx *utils.Context) *DAO {
-	return &DAO{
+func NewDAO(ctx *utils.Context) *LuckDrawDao {
+	return &LuckDrawDao{
 		ctx: ctx,
 		db:  ctx.DB,
 	}
 }
 
-const (
-	STATUS_NOWRITROFF = 0
-)
-
 // LuckDraw 抽奖记录
 type LuckDraw struct {
 	model.TaLuckdraw `xorm:"extends"`
@@ -39,101 +32,110 @@ type LuckDraw struct {
 }
 
 // GetLuckDraw 获取抽奖信息
-func (m *DAO) GetLuckDraw(id int) (*LuckDraw, error) {
-	if id == 0 {
-		return nil, utils.LogError("不存在抽奖信息！")
+func (m *LuckDrawDao) GetLuckDraw(id string) (*LuckDraw, error) {
+	if id == "" {
+		return nil, errors.New("不存在抽奖信息！")
 	}
-
 	luckdraw, err := m.GetLuckDrawByID(id)
 	if err != nil {
-		return nil, err
+		utils.LogError("获取抽奖信息失败：", err)
+		return nil, errors.New("获取抽奖信息失败")
 	}
 	prizes, err := m.GetPrizes(id)
 	if err != nil {
-		return nil, err
+		utils.LogError("获取奖品信息失败：", err)
+		return nil, errors.New("获取奖品信息失败")
 	}
 	luckdraw.Prizes = prizes
 	return luckdraw, nil
 }
 
 // LuckDraw 抽奖
-func (m *DAO) LuckDraw(id int, user *model.TaCustomer) (*model.TaLuckdrawPrize, *model.TaPrizeDetail, error) {
+func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuckdrawPrize, *model.TaPrizeDetail, error) {
 	luckdraw, err := m.GetLuckDrawByID(id)
 	if err != nil {
-		return nil, nil, utils.LogError("获取抽奖信息失败！", err)
+		return nil, nil, errors.New("获取抽奖信息失败！")
 	}
 	if luckdraw.Status != models.STATUS_NORMAL {
-		return nil, nil, utils.LogError("当前抽奖活动状态异常！")
+		return nil, nil, errors.New("当前抽奖活动状态异常！")
 	}
 	if time.Now().Before(luckdraw.BeginDate) {
-		return nil, nil, utils.LogError("活动还未开始！")
+		return nil, nil, errors.New("活动还未开始！")
 	}
 	if time.Now().After(luckdraw.EndDate) {
-		return nil, nil, utils.LogError("活动已结束！")
+		return nil, nil, errors.New("活动已结束！")
 	}
 	if user.Phone != "" {
 		sysuser, err := m.GetUserByTel(user.Phone)
 		if err != nil {
-			return nil, nil, utils.LogError("获取信息失败！", err)
+			return nil, nil, errors.New("获取信息失败！")
 		}
 		if sysuser != nil {
-			return nil, nil, utils.LogError("内部人员不允许进行抽奖！")
+			return nil, nil, errors.New("内部人员不允许进行抽奖！")
 		}
 	}
 	userluckdraws, err := m.GetUserRecordByLuckDraw(user.CustomerId, id)
 	if err != nil {
-		return nil, nil, utils.LogError("获取用户抽奖信息失败！", err)
+		utils.LogError("获取用户抽奖信息失败:", err)
+		return nil, nil, errors.New("获取用户抽奖信息失败！")
 	}
 	if len(userluckdraws) > 0 {
-		return nil, nil, utils.LogError("您已参与过此次抽奖，不允许重复抽奖！")
+		return nil, nil, errors.New("您已参与过此次抽奖，不允许重复抽奖！")
 	}
 	prizes, err := m.GetPrizeStock(id)
 	if err != nil {
-		return nil, nil, utils.LogError("获取奖项失败！", err)
+		utils.LogError("获取奖项失败:", err)
+		return nil, nil, errors.New("获取奖项失败！")
 	}
 	if len(prizes) == 0 {
 		err = m.UpdateLuckDrawEndDate(luckdraw.Id)
 		if err != nil {
-			return nil, nil, utils.LogError("操作失败，请刷新后重试！", err)
+			utils.LogError("操作失败，请刷新后重试:", err)
+			return nil, nil, errors.New("操作失败，请刷新后重试！")
 		}
-		return nil, nil, utils.LogError("活动已结束！")
+		return nil, nil, errors.New("活动已结束！")
 	}
 	prize, err := m.GetWinning(prizes)
 	if err != nil {
-		return nil, nil, utils.LogError("获取奖项失败！", err)
+		utils.LogError("获取奖项失败:", err)
+		return nil, nil, errors.New("获取奖项失败！")
 	}
 
-	details, err := m.GetPrizeDetail(prize.Id)
-	if err != nil {
-		return nil, nil, utils.LogError("获取奖项详情失败！", err)
-	}
+	// details, err := m.GetPrizeDetail(prize.Id)
+	// if err != nil {
+	// 	utils.LogError("获取奖项详情失败:", err)
+	// 	return nil, nil, errors.New("获取奖项详情失败！")
+	// }
 
 	// 保存中奖记录
 	var record = model.TaLuckdrawRecord{}
+	record.Id = utils.GetGUID()
 	record.OrgId = luckdraw.OrgId
 	record.CaseId = luckdraw.CaseId
 	record.PrizeId = prize.Id
 	record.PrizeName = prize.PrizeName
 	record.UserId = user.CustomerId
-	record.UserName = user.Name
+	record.UserName = user.CustomerName
 	record.UserHeadImg = user.Headimgurl
 	record.LuckdrawId = luckdraw.Id
-	newrecord, err := m.SaveRecord(record)
-	var detail = model.TaPrizeDetail{}
-	if len(details) > 0 {
-		// 更新中奖纪录明细
-		details[0].ReceiveId = newrecord.Id
-		err = m.UpdatePrizeDetail(details[0])
-		if err != nil {
-			return nil, nil, utils.LogError("操作失败！", err)
-		}
-		detail = details[0]
-		// 奖项自动核销，走卡券核销流程
-		err = m.PrizeWriteOff(newrecord.Id, user.CustomerId)
-		if err != nil {
-			return nil, nil, utils.LogError("操作失败！", err)
-		}
-	}
+	_, err = m.SaveRecord(record)
+	// var detail = model.TaPrizeDetail{}
+	// if len(details) > 0 {
+	// 	// 更新中奖纪录明细
+	// 	details[0].ReceiveId = newrecord.Id
+	// 	err = m.UpdatePrizeDetail(details[0])
+	// 	if err != nil {
+	// 		utils.LogError("更新中奖纪录明细失败:", err)
+	// 		return nil, nil, errors.New("操作失败！")
+	// 	}
+	// 	detail = details[0]
+	// 	// 奖项自动核销，走卡券核销流程
+	// 	err = m.PrizeWriteOff(newrecord.Id, user.CustomerId)
+	// 	if err != nil {
+	// 		utils.LogError("卡券核销失败:", err)
+	// 		return nil, nil, errors.New("操作失败！")
+	// 	}
+	// }
 	// 更新库存
 	if prize.IsReality == 1 {
 		prize.Remainder = prize.Remainder - 1
@@ -143,7 +145,8 @@ func (m *DAO) LuckDraw(id int, user *model.TaCustomer) (*model.TaLuckdrawPrize,
 		}
 		stockprizes, err := m.GetPrizeStock(id)
 		if err != nil {
-			return nil, nil, utils.LogError("操作失败，请刷新后重试！", err)
+			utils.LogError("更新库存失败:", err)
+			return nil, nil, errors.New("操作失败，请刷新后重试！")
 		}
 		if len(stockprizes) == 0 {
 			// 更新活动截止时间
@@ -151,11 +154,11 @@ func (m *DAO) LuckDraw(id int, user *model.TaCustomer) (*model.TaLuckdrawPrize,
 		}
 	}
 
-	return prize, &detail, err
+	return prize, nil, err
 }
 
 // PrizeWriteOff 奖品核销
-func (m *DAO) PrizeWriteOff(recordid int, userid string) error {
+func (m *LuckDrawDao) PrizeWriteOff(recordid, userid string) error {
 	record, err := m.GetRecordByID(recordid)
 	if err != nil {
 		return err
@@ -175,7 +178,7 @@ func (m *DAO) PrizeWriteOff(recordid int, userid string) error {
 }
 
 // GetWinning 获取中奖信息
-func (m *DAO) GetWinning(prizes []model.TaLuckdrawPrize) (*model.TaLuckdrawPrize, error) {
+func (m *LuckDrawDao) GetWinning(prizes []model.TaLuckdrawPrize) (*model.TaLuckdrawPrize, error) {
 	pList := make([]map[string]interface{}, 0)
 	now := time.Now().Local()
 
@@ -192,7 +195,7 @@ func (m *DAO) GetWinning(prizes []model.TaLuckdrawPrize) (*model.TaLuckdrawPrize
 	}
 
 	if len(pList) == 0 {
-		return nil, utils.LogError("所有奖品已抽完")
+		return nil, errors.New("所有奖品已抽完")
 	}
 
 	thePrize := utils.LuckyDraw(pList).(model.TaLuckdrawPrize)
@@ -201,7 +204,7 @@ func (m *DAO) GetWinning(prizes []model.TaLuckdrawPrize) (*model.TaLuckdrawPrize
 }
 
 // GetLuckDrawByID 获取抽奖信息
-func (m *DAO) GetLuckDrawByID(id int) (*LuckDraw, error) {
+func (m *LuckDrawDao) GetLuckDrawByID(id string) (*LuckDraw, error) {
 	var luckdraws []LuckDraw
 	sql := `select * from ta_luckdraw where id= ?`
 	err := m.db.SQL(sql, id).Find(&luckdraws)
@@ -214,32 +217,8 @@ func (m *DAO) GetLuckDrawByID(id int) (*LuckDraw, error) {
 	return nil, nil
 }
 
-// GetCaseAddressByLuckDarw 获取案场地址
-func (m *DAO) GetCaseAddressByLuckDarw(luckdraw int) (string, error) {
-	sql := `
-		SELECT
-			t.address
-		FROM
-			sys_case t
-		INNER JOIN ta_luckdraw s ON t.case_id = s.case_id
-		WHERE
-			s.id = ?
-	`
-
-	res, err := m.db.Query(sql, luckdraw)
-	if err != nil {
-		return "", err
-	}
-
-	if res == nil || len(res) == 0 {
-		return "", nil
-	}
-
-	return string(res[0]["address"]), nil
-}
-
 // UpdateLuckDrawEndDate 更新活动结束时间
-func (m *DAO) UpdateLuckDrawEndDate(id int) error {
+func (m *LuckDrawDao) UpdateLuckDrawEndDate(id string) error {
 	var luckdraw = model.TaLuckdraw{
 		Id:      id,
 		EndDate: time.Now(),
@@ -252,14 +231,14 @@ func (m *DAO) UpdateLuckDrawEndDate(id int) error {
 }
 
 // GetPrizes 获取奖品信息
-func (m *DAO) GetPrizes(luckdrawid int) ([]model.TaLuckdrawPrize, error) {
+func (m *LuckDrawDao) GetPrizes(luckdrawid string) ([]model.TaLuckdrawPrize, error) {
 	var prizes []model.TaLuckdrawPrize
 	err := m.db.Where("luckdraw_id=?", luckdrawid).And("status=?", models.STATUS_NORMAL).Find(&prizes)
 	return prizes, err
 }
 
 // UpdateStock 修改库存
-func (m *DAO) UpdateStock(prize *model.TaLuckdrawPrize) error {
+func (m *LuckDrawDao) UpdateStock(prize *model.TaLuckdrawPrize) error {
 	cols := []string{
 		"remainder",
 	}
@@ -268,36 +247,44 @@ func (m *DAO) UpdateStock(prize *model.TaLuckdrawPrize) error {
 }
 
 // GetPrizeStock 判断奖项库存
-func (m *DAO) GetPrizeStock(luckdrawid int) ([]model.TaLuckdrawPrize, error) {
+func (m *LuckDrawDao) GetPrizeStock(luckdrawid string) ([]model.TaLuckdrawPrize, error) {
 	var prizes []model.TaLuckdrawPrize
 	err := m.db.Where("luckdraw_id=?", luckdrawid).And("status=?", models.STATUS_NORMAL).And("(remainder>0 or is_reality=0)").Find(&prizes)
 	return prizes, err
 }
 
 // GetPrizeByID 根据id获取奖品信息
-func (m *DAO) GetPrizeByID(id int) (model.TaLuckdrawPrize, error) {
+func (m *LuckDrawDao) GetPrizeByID(id int) (model.TaLuckdrawPrize, error) {
 	var prize = model.TaLuckdrawPrize{}
 	_, err := m.db.Where("id=?", id).Get(&prize)
 	return prize, err
 }
 
 // SaveRecord 保存抽奖记录
-func (m *DAO) SaveRecord(record model.TaLuckdrawRecord) (*model.TaLuckdrawRecord, error) {
+func (m *LuckDrawDao) SaveRecord(record model.TaLuckdrawRecord) (*model.TaLuckdrawRecord, error) {
 	record.CreateDate = time.Now()
-	record.Status = STATUS_NOWRITROFF
+	record.Status = models.STATUS_READY
+	record.Id = utils.GetGUID()
 	_, err := m.db.Insert(&record)
 	return &record, err
 }
 
+// GetUserByTel 根据电话获取用户信息
+func (m *LuckDrawDao) GetUserByTel(tel string) (*model.SysUser, error) {
+	var user = model.SysUser{}
+	_, err := m.db.Where("phone=?", tel).Get(&user)
+	return &user, err
+}
+
 // GetPrizeDetail 获取未领取的奖品详情
-func (m *DAO) GetPrizeDetail(prizeid int) ([]model.TaPrizeDetail, error) {
+func (m *LuckDrawDao) GetPrizeDetail(prizeid string) ([]model.TaPrizeDetail, error) {
 	var details []model.TaPrizeDetail
-	err := m.db.Where("prize_id=?", prizeid).And("status=?", STATUS_NOWRITROFF).Find(&details)
+	err := m.db.Where("prize_id=?", prizeid).And("status=?", models.STATUS_READY).Find(&details)
 	return details, err
 }
 
 // UpdatePrizeDetail 更新库存明细为已领取
-func (m *DAO) UpdatePrizeDetail(detail model.TaPrizeDetail) error {
+func (m *LuckDrawDao) UpdatePrizeDetail(detail model.TaPrizeDetail) error {
 	detail.Status = models.STATUS_NORMAL
 	detail.ReceiveDate = time.Now()
 	cols := []string{
@@ -310,7 +297,7 @@ func (m *DAO) UpdatePrizeDetail(detail model.TaPrizeDetail) error {
 }
 
 // UpdateRecord 核销更新抽奖记录表
-func (m *DAO) UpdateRecord(record *model.TaLuckdrawRecord) error {
+func (m *LuckDrawDao) UpdateRecord(record *model.TaLuckdrawRecord) error {
 	record.Status = models.STATUS_NORMAL
 	record.WriteoffDate = time.Now()
 	cols := []string{
@@ -322,22 +309,23 @@ func (m *DAO) UpdateRecord(record *model.TaLuckdrawRecord) error {
 }
 
 // SaveWirteOff 保存核销信息
-func (m *DAO) SaveWirteOff(writeoff model.TaLuckdrawWriteoff) (*model.TaLuckdrawWriteoff, error) {
+func (m *LuckDrawDao) SaveWirteOff(writeoff model.TaLuckdrawWriteoff) (*model.TaLuckdrawWriteoff, error) {
 	writeoff.Status = models.STATUS_NORMAL
+	writeoff.Id = utils.GetGUID()
 	writeoff.WriteoffDate = time.Now()
 	_, err := m.db.Insert(&writeoff)
 	return &writeoff, err
 }
 
 // GetUserRecordByLuckDraw 获取用户的抽奖信息
-func (m *DAO) GetUserRecordByLuckDraw(userid string, luckdrawid int) ([]model.TaLuckdrawRecord, error) {
+func (m *LuckDrawDao) GetUserRecordByLuckDraw(userid string, luckdrawid string) ([]model.TaLuckdrawRecord, error) {
 	var records []model.TaLuckdrawRecord
 	err := m.db.Where("user_id=?", userid).And("luckdraw_id=?", luckdrawid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&records)
 	return records, err
 }
 
 // GetUserLuckDrawByLuckDraw 获取用户的抽奖信息
-func (m *DAO) GetUserLuckDrawByLuckDraw(userid string, luckdrawid int) (*model.TaLuckdrawRecord, error) {
+func (m *LuckDrawDao) GetUserLuckDrawByLuckDraw(userid string, luckdrawid string) (*model.TaLuckdrawRecord, error) {
 	var records []model.TaLuckdrawRecord
 	err := m.db.Where("user_id=?", userid).And("luckdraw_id=?", luckdrawid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&records)
 	if err != nil {
@@ -350,7 +338,7 @@ func (m *DAO) GetUserLuckDrawByLuckDraw(userid string, luckdrawid int) (*model.T
 }
 
 // GetDetailByRecord 获取detail
-func (m *DAO) GetDetailByRecord(recordid int) (*model.TaPrizeDetail, error) {
+func (m *LuckDrawDao) GetDetailByRecord(recordid string) (*model.TaPrizeDetail, error) {
 	var details []model.TaPrizeDetail
 	err := m.db.Where("receive_id=?", recordid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&details)
 	if err != nil {
@@ -369,7 +357,7 @@ type UserRecord struct {
 }
 
 // GetUserLuckDraw 获取用户的抽奖信息
-func (m *DAO) GetUserLuckDraw(userid string) ([]UserRecord, error) {
+func (m *LuckDrawDao) GetUserLuckDraw(userid string) ([]UserRecord, error) {
 	var records []UserRecord
 	sql := `select a.*,b.url from ta_luckdraw_record a left join ta_prize_detail b on a.id=b.receive_id where a.user_id=? and a.status>` + strconv.Itoa(models.STATUS_DEL)
 	err := m.db.Sql(sql, userid).Find(&records)
@@ -377,49 +365,24 @@ func (m *DAO) GetUserLuckDraw(userid string) ([]UserRecord, error) {
 }
 
 // GetRecordByLuckDraw 抽奖记录
-func (m *DAO) GetRecordByLuckDraw(luckdrawid int) ([]model.TaLuckdrawRecord, error) {
+func (m *LuckDrawDao) GetRecordByLuckDraw(luckdrawid string) ([]model.TaLuckdrawRecord, error) {
 	var records []model.TaLuckdrawRecord
 	err := m.db.Where("luckdraw_id=?", luckdrawid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Desc("create_date").Find(&records)
 	return records, err
 }
 
 // GetRecordByID 获取抽奖记录明细
-func (m *DAO) GetRecordByID(id int) (*model.TaLuckdrawRecord, error) {
+func (m *LuckDrawDao) GetRecordByID(id string) (*model.TaLuckdrawRecord, error) {
 	var record model.TaLuckdrawRecord
 	_, err := m.db.Where("id=?", id).Get(&record)
 	return &record, err
 }
 
-// GetUserByOpenID 根据 openid 获取用户人员信息
-func (m *DAO) GetUserByOpenID(openid string) (*model.SysUser, error) {
-	var users []model.SysUser
-	err := m.db.Where("open_id=?", openid).Find(&users)
-	if err != nil {
-		return nil, err
-	}
-	if len(users) > 0 {
-		return &users[0], nil
-	}
-	return nil, nil
-}
-
-// GetUserByTel 根据 Tel 获取用户人员信息
-func (m *DAO) GetUserByTel(tel string) (*model.SysUser, error) {
-	var users = model.SysUser{}
-	has, err := m.db.Where("phone=?", tel).Get(&users)
-	if err != nil {
-		return nil, err
-	}
-	if !has {
-		return nil, nil
-	}
-	return &users, nil
-}
-
 // SaveLuckDrawShareData 保存用户分享信息
-func (m *DAO) SaveLuckDrawShareData(dt *model.TaShareLuckyRecord) error {
+func (m *LuckDrawDao) SaveLuckDrawShareData(dt *model.TaShareLuckyRecord) error {
 	dt.CreateDate = time.Now().Local()
-	dt.Status = StatusNormal
+	dt.Status = models.STATUS_NORMAL
+	dt.Id = utils.GetGUID()
 
 	if _, err := m.db.Insert(dt); err != nil {
 		return err
@@ -429,14 +392,14 @@ func (m *DAO) SaveLuckDrawShareData(dt *model.TaShareLuckyRecord) error {
 }
 
 // GetLuckDrawShareData 获取用户分享内容
-func (m *DAO) GetLuckDrawShareData(luckID int, from, to, caseID string) ([]model.TaShareLuckyRecord, error) {
+func (m *LuckDrawDao) GetLuckDrawShareData(from, to, luckID, caseID int) ([]model.TaShareLuckyRecord, error) {
 	var dts []model.TaShareLuckyRecord
 
 	if err := m.db.Where("from_customer_id=?", from).
 		And("to_customer_id=?", to).
 		And("luckydraw_id=?", luckID).
 		And("case_id=?", caseID).
-		And("status=?", StatusNormal).
+		And("status=?", models.STATUS_NORMAL).
 		Find(&dts); err != nil {
 		return nil, err
 	}

models/model/ta_body_check.go

@@ -5,11 +5,11 @@ import (
 )
 
 type TaBodyCheck struct {
-	Id          int       `xorm:"not null pk autoincr INT(11)"`
-	UserId      string    `xorm:"not null INT(11)"`
-	EquipmentId string    `xorm:"not null VARCHAR(100)"`
+	Id          string    `xorm:"not null pk VARCHAR(64)"`
+	UserId      string    `xorm:"VARCHAR(64)"`
+	EquipmentId string    `xorm:"not null VARCHAR(200)"`
 	CreateDate  time.Time `xorm:"not null DATETIME"`
 	Status      int       `xorm:"not null comment('1为正常') INT(11)"`
-	CaseId      int       `xorm:"INT(11)"`
+	CaseId      string    `xorm:"VARCHAR(64)"`
 	ReportUrl   string    `xorm:"TEXT"`
 }

models/model/ta_case_equipment.go

@@ -5,8 +5,8 @@ import (
 )
 
 type TaCaseEquipment struct {
-	Id          int       `xorm:"not null pk autoincr INT(11)"`
-	CaseId      int       `xorm:"not null INT(11)"`
+	Id          string    `xorm:"not null pk VARCHAR(64)"`
+	CaseId      string    `xorm:"not null pk VARCHAR(64)"`
 	EquipmentId string    `xorm:"VARCHAR(200)"`
 	Status      int       `xorm:"INT(11)"`
 	CreateDate  time.Time `xorm:"DATETIME"`

models/model/ta_luckdraw.go

@@ -5,9 +5,9 @@ import (
 )
 
 type TaLuckdraw struct {
-	Id           int       `xorm:"not null pk autoincr INT(11)"`
+	Id           string    `xorm:"not null pk VARCHAR(64)"`
 	Name         string    `xorm:"VARCHAR(50)"`
-	ThemeId      int       `xorm:"INT(11)"`
+	ThemeId      string    `xorm:"VARCHAR(64)"`
 	LuckdrawRule string    `xorm:"TEXT"`
 	BeginDate    time.Time `xorm:"DATETIME"`
 	EndDate      time.Time `xorm:"DATETIME"`

models/model/ta_luckdraw_prize.go

@@ -5,8 +5,8 @@ import (
 )
 
 type TaLuckdrawPrize struct {
-	Id                int       `xorm:"not null pk autoincr INT(11)"`
-	LuckdrawId        int       `xorm:"INT(11)"`
+	Id                string    `xorm:"not null pk VARCHAR(64)"`
+	LuckdrawId        string    `xorm:"VARCHAR(64)"`
 	PrizeName         string    `xorm:"VARCHAR(50)"`
 	PrizeImg          string    `xorm:"TEXT"`
 	Stock             int       `xorm:"INT(11)"`

models/model/ta_luckdraw_record.go

@@ -5,9 +5,9 @@ import (
 )
 
 type TaLuckdrawRecord struct {
-	Id           int       `xorm:"not null pk autoincr INT(11)"`
-	LuckdrawId   int       `xorm:"INT(11)"`
-	PrizeId      int       `xorm:"INT(11)"`
+	Id           string    `xorm:"not null pk VARCHAR(64)"`
+	LuckdrawId   string    `xorm:"VARCHAR(64)"`
+	PrizeId      string    `xorm:"VARCHAR(64)"`
 	PrizeName    string    `xorm:"VARCHAR(50)"`
 	UserId       string    `xorm:"VARCHAR(64)"`
 	UserName     string    `xorm:"VARCHAR(50)"`

models/model/ta_luckdraw_writeoff.go

@@ -5,9 +5,9 @@ import (
 )
 
 type TaLuckdrawWriteoff struct {
-	Id           int       `xorm:"not null pk autoincr INT(11)"`
-	LuckdrawId   int       `xorm:"INT(11)"`
-	RecordId     int       `xorm:"INT(11)"`
+	Id           string    `xorm:"not null pk VARCHAR(64)"`
+	LuckdrawId   string    `xorm:"VARCHAR(64)"`
+	RecordId     string    `xorm:"VARCHAR(64)"`
 	WriteoffDate time.Time `xorm:"DATETIME"`
 	WriteoffUser string    `xorm:"VARCHAR(64)"`
 	Status       int       `xorm:"SMALLINT(6)"`

models/model/ta_presentation.go

@@ -5,8 +5,8 @@ import (
 )
 
 type TaPresentation struct {
-	Id          int       `xorm:"not null pk autoincr INT(11)"`
-	CheckId     int       `xorm:"not null INT(11)"`
+	Id          string    `xorm:"not null pk VARCHAR(64)"`
+	CheckId     string    `xorm:"not null pk VARCHAR(64)"`
 	CheckType   int       `xorm:"SMALLINT(6)"`
 	CheckDate   time.Time `xorm:"DATETIME"`
 	CheckResult string    `xorm:"TEXT"`

models/model/ta_presentation_detail.go

@@ -1,8 +1,8 @@
 package model
 
 type TaPresentationDetail struct {
-	Id             int    `xorm:"not null pk autoincr INT(11)"`
-	PresentationId int    `xorm:"not null INT(11)"`
+	Id             string `xorm:"not null pk VARCHAR(64)"`
+	PresentationId string `xorm:"not null pk VARCHAR(64)"`
 	CheckName      string `xorm:"VARCHAR(50)"`
 	CheckVal       string `xorm:"VARCHAR(500)"`
 	SpecName       string `xorm:"VARCHAR(50)"`

models/model/ta_prize_detail.go

@@ -5,10 +5,10 @@ import (
 )
 
 type TaPrizeDetail struct {
-	Id          int       `xorm:"not null pk autoincr INT(11)"`
-	PrizeId     int       `xorm:"INT(11)"`
+	Id          string    `xorm:"not null pk VARCHAR(64)"`
+	PrizeId     string    `xorm:"VARCHAR(64)"`
 	Url         string    `xorm:"TEXT"`
 	Status      int       `xorm:"SMALLINT(6)"`
-	ReceiveId   int       `xorm:"INT(11)"`
+	ReceiveId   string    `xorm:"VARCHAR(64)"`
 	ReceiveDate time.Time `xorm:"DATETIME"`
 }

models/model/ta_share_lucky_record.go

@@ -5,7 +5,7 @@ import (
 )
 
 type TaShareLuckyRecord struct {
-	Id                 int       `xorm:"not null pk autoincr INT(11)"`
+	Id                 string    `xorm:"not null pk VARCHAR(64)"`
 	FromCustomerId     string    `xorm:"VARCHAR(64)"`
 	FromCustomerName   string    `xorm:"VARCHAR(32)"`
 	FromCustomerWxname string    `xorm:"VARCHAR(64)"`
@@ -17,6 +17,6 @@ type TaShareLuckyRecord struct {
 	CreateDate         time.Time `xorm:"DATETIME"`
 	CaseId             string    `xorm:"VARCHAR(64)"`
 	Status             int       `xorm:"SMALLINT(6)"`
-	LuckydrawId        int       `xorm:"INT(11)"`
+	LuckydrawId        string    `xorm:"VARCHAR(64)"`
 	LuckydrawName      string    `xorm:"VARCHAR(128)"`
 }

models/model/ta_sta_arrived_daily.go

@@ -0,0 +1,9 @@
+package model
+
+type TaStaArrivedDaily struct {
+	Id      int    `xorm:"not null pk autoincr INT(11)"`
+	OrgId   string `xorm:"VARCHAR(64)"`
+	CaseId  string `xorm:"VARCHAR(64)"`
+	StaDate string `xorm:"VARCHAR(20)"`
+	Amount  int    `xorm:"INT(11)"`
+}

models/model/ta_sta_course_daily.go

@@ -0,0 +1,9 @@
+package model
+
+type TaStaCourseDaily struct {
+	Id      int    `xorm:"not null pk autoincr INT(11)"`
+	OrgId   string `xorm:"VARCHAR(64)"`
+	CaseId  string `xorm:"VARCHAR(64)"`
+	StaDate string `xorm:"VARCHAR(20)"`
+	Amount  int    `xorm:"INT(11)"`
+}

models/model/ta_sta_course_order_daily.go

@@ -0,0 +1,11 @@
+package model
+
+type TaStaCourseOrderDaily struct {
+	Id         int    `xorm:"not null pk autoincr INT(11)"`
+	OrgId      string `xorm:"VARCHAR(64)"`
+	CaseId     string `xorm:"VARCHAR(64)"`
+	StaDate    string `xorm:"VARCHAR(20)"`
+	CourseType string `xorm:"VARCHAR(64)"`
+	TypeName   string `xorm:"VARCHAR(255)"`
+	Amount     int    `xorm:"INT(11)"`
+}

models/model/ta_sta_customer_daily.go

@@ -0,0 +1,9 @@
+package model
+
+type TaStaCustomerDaily struct {
+	Id      int    `xorm:"not null pk autoincr INT(11)"`
+	OrgId   string `xorm:"VARCHAR(64)"`
+	CaseId  string `xorm:"VARCHAR(64)"`
+	StaDate string `xorm:"VARCHAR(20)"`
+	Amount  int    `xorm:"INT(11)"`
+}

models/model/ta_sta_goods_daily.go

@@ -0,0 +1,11 @@
+package model
+
+type TaStaGoodsDaily struct {
+	Id       int    `xorm:"not null pk autoincr INT(11)"`
+	OrgId    string `xorm:"VARCHAR(64)"`
+	CaseId   string `xorm:"VARCHAR(64)"`
+	StaDate  string `xorm:"VARCHAR(20)"`
+	UserType string `xorm:"VARCHAR(20)"`
+	TypeName string `xorm:"VARCHAR(255)"`
+	Amount   int    `xorm:"INT(11)"`
+}

models/model/td_check_spec.go

@@ -1,7 +1,7 @@
 package model
 
 type TdCheckSpec struct {
-	Id       int    `xorm:"not null pk autoincr INT(11)"`
+	Id       string `xorm:"not null pk VARCHAR(64)"`
 	Name     string `xorm:"not null VARCHAR(50)"`
 	SortName string `xorm:"not null VARCHAR(50)"`
 	Standard string `xorm:"VARCHAR(50)"`

models/model/td_check_type.go

@@ -1,6 +1,6 @@
 package model
 
 type TdCheckType struct {
-	Id       int    `xorm:"not null pk autoincr INT(11)"`
+	Id       string `xorm:"not null pk VARCHAR(64)"`
 	TypeName string `xorm:"VARCHAR(50)"`
 }

models/model/td_luckdraw_theme.go

@@ -1,7 +1,7 @@
 package model
 
 type TdLuckdrawTheme struct {
-	Id        int    `xorm:"not null pk autoincr INT(11)"`
+	Id        string `xorm:"not null pk VARCHAR(64)"`
 	ThemeName string `xorm:"VARCHAR(50)"`
 	Status    int    `xorm:"SMALLINT(6)"`
 	OrgId     string `xorm:"VARCHAR(64)"`

models/model/td_statistics_comps.go

@@ -5,4 +5,5 @@ type TdStatisticsComps struct {
 	CompName string `xorm:"VARCHAR(255)"`
 	CompType string `xorm:"VARCHAR(64)"`
 	TypeName string `xorm:"VARCHAR(255)"`
+	Group    int    `xorm:"SMALLINT(6)"`
 }

models/statistics/cardcoupon.go

@@ -105,7 +105,7 @@ func (m *StatisticsDAO) CardCouponStatistics(caseids, ctype, name string, page,
 }
 
 // CardCouponStatisticsCount 获取总数
-func (m *StatisticsDAO) CardCouponStatisticsCount(caseids, ctype, name string) (int, error) {
+func (m *StatisticsDAO) CardCouponStatisticsCount(caseids, ctype, name string) ([]CardCouponStatistics, error) {
 	var cardCoupons []CardCouponStatistics
 	couponsql := `SELECT
 		b.case_name,
@@ -175,7 +175,7 @@ func (m *StatisticsDAO) CardCouponStatisticsCount(caseids, ctype, name string) (
 		// 	sql = "select * from (" + gymcardsql + ") tab"
 		// 	break
 		default:
-			return 0, errors.New("类型不正确")
+			return cardCoupons, errors.New("类型不正确")
 		}
 	} else {
 		sql = "select * from (" + cardsql + " union " + couponsql + ") tab"
@@ -185,7 +185,7 @@ func (m *StatisticsDAO) CardCouponStatisticsCount(caseids, ctype, name string) (
 		sql = sql + ` where c_name like '%` + name + `%'`
 	}
 	err := m.db.Sql(sql).Find(&cardCoupons)
-	return len(cardCoupons), err
+	return cardCoupons, err
 }
 
 // CardCouponUsedStatistics 卡券使用情况
@@ -308,7 +308,7 @@ func (m *StatisticsDAO) CardCouponUsedStatistics(caseids, tel, name, receivetype
 }
 
 // CardCouponUsedCountStatistics 获取卡券使用情况统计
-func (m *StatisticsDAO) CardCouponUsedCountStatistics(caseids, tel, name, receivetype, begindate, enddate, status string) (int, error) {
+func (m *StatisticsDAO) CardCouponUsedCountStatistics(caseids, tel, name, receivetype, begindate, enddate, status string) ([]CardCouponUsedStatistics, error) {
 	var cardCoupons []CardCouponUsedStatistics
 	cardsql := `SELECT
 							d.case_name,
@@ -402,7 +402,7 @@ func (m *StatisticsDAO) CardCouponUsedCountStatistics(caseids, tel, name, receiv
 		sql = sql + ` and DATE_FORMAT(tab.receive_date, '%Y-%m-%d') <= '` + enddate + `'`
 	}
 	err := m.db.Sql(sql).Find(&cardCoupons)
-	return len(cardCoupons), err
+	return cardCoupons, err
 }
 
 // CardCouponVerifyStatistics 卡券使用情况
@@ -481,7 +481,7 @@ func (m *StatisticsDAO) CardCouponVerifyStatistics(caseids, tel, name, status st
 }
 
 // CardCouponVerifyStatisticsCount 获取卡券核销情况数量统计
-func (m *StatisticsDAO) CardCouponVerifyStatisticsCount(caseids, tel, name, status string) (int, error) {
+func (m *StatisticsDAO) CardCouponVerifyStatisticsCount(caseids, tel, name, status string) ([]CardCouponVerifyStatistics, error) {
 	var cardCoupons []CardCouponVerifyStatistics
 	sql := `SELECT
 							c.case_id,
@@ -535,5 +535,5 @@ func (m *StatisticsDAO) CardCouponVerifyStatisticsCount(caseids, tel, name, stat
 		}
 	}
 	err := m.db.Sql(sql).Find(&cardCoupons)
-	return len(cardCoupons), err
+	return cardCoupons, err
 }

models/statistics/course.go

@@ -63,7 +63,7 @@ func (m *StatisticsDAO) GetCourseOrdersStatistics(typeid, caseids, name, beginda
 }
 
 // GetCourseOrdersStatisticsCount 获取课程订单统计数量
-func (m *StatisticsDAO) GetCourseOrdersStatisticsCount(typeid, caseids, name, begindate, enddate string) (int, error) {
+func (m *StatisticsDAO) GetCourseOrdersStatisticsCount(typeid, caseids, name, begindate, enddate string) ([]CourseOrdersStatistics, error) {
 	var courseOrders []CourseOrdersStatistics
 	sql := `SELECT
 					a.orders_id,
@@ -98,7 +98,7 @@ func (m *StatisticsDAO) GetCourseOrdersStatisticsCount(typeid, caseids, name, be
 	}
 
 	err := m.db.Sql(sql).Find(&courseOrders)
-	return len(courseOrders), err
+	return courseOrders, err
 }
 
 // CourseStatistics 课程统计数据
@@ -166,7 +166,7 @@ func (m *StatisticsDAO) GetCourseStatistics(typeid, caseids, name string, page,
 }
 
 // GetCourseStatisticsCount 获取课程统计信息数量
-func (m *StatisticsDAO) GetCourseStatisticsCount(typeid, caseids, name string) (int, error) {
+func (m *StatisticsDAO) GetCourseStatisticsCount(typeid, caseids, name string) ([]CourseStatistics, error) {
 	var courses []CourseStatistics
 	sql := `SELECT
 					a.course_id,
@@ -188,5 +188,5 @@ func (m *StatisticsDAO) GetCourseStatisticsCount(typeid, caseids, name string) (
 		sql = sql + ` and a.course_name like '%` + name + `%'`
 	}
 	err := m.db.Sql(sql).Find(&courses)
-	return len(courses), err
+	return courses, err
 }

models/statistics/dashboard.go

@@ -0,0 +1,418 @@
+package statistics
+
+import (
+	"spaceofcheng/services/models"
+	"strconv"
+	"strings"
+	"time"
+)
+
+var sqlThisWeek = `
+SELECT
+	DATE_FORMAT(
+		date_add(
+			date_sub(
+				curdate(),
+				INTERVAL WEEKDAY(curdate()) + 1 DAY
+			),
+			INTERVAL rownum DAY
+		),
+		'%Y-%m-%d'
+	) AS dt
+FROM sequence
+WHERE rownum < 7
+`
+
+var sqlThisMonth = `
+SELECT
+	DATE_FORMAT(
+		DATE_add(
+			DATE_add(
+				LAST_DAY(curdate() - INTERVAL 1 MONTH),
+				INTERVAL 1 DAY
+			),
+			INTERVAL rownum DAY
+		),
+		'%Y-%m-%d'
+	) AS dt
+FROM
+	sequence
+WHERE
+	rownum < (
+		SELECT
+			DATEDIFF(
+				date_add(
+					curdate() - DAY (curdate()) + 1,
+					INTERVAL 1 MONTH
+				),
+				DATE_ADD(
+					curdate(),
+					INTERVAL - DAY (curdate()) + 1 DAY
+				)
+			)
+	)
+`
+
+// GetCustomerNumber 获取会员数量
+func (m *StatisticsDAO) GetCustomerNumber(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
+	return m.execMySQLFunc("fun_total_customer", orgID, caseIDs, start, end)
+}
+
+// GetCourseOrderNumber 获取课程预约 - 统计课程
+func (m *StatisticsDAO) GetCourseOrderNumber(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
+	return m.execMySQLFunc("fun_course_order", orgID, caseIDs, start, end)
+}
+
+// GetCourseOrderCustomer 获取课程预约 - 统计人员
+func (m *StatisticsDAO) GetCourseOrderCustomer(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
+	return m.execMySQLFunc("fun_course_order_customer", orgID, caseIDs, start, end)
+}
+
+// GetUsedCourseOrderCustomer 获取课程核销 - 统计人员
+func (m *StatisticsDAO) GetUsedCourseOrderCustomer(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
+	return m.execMySQLFunc("fun_used_course_order_customer", orgID, caseIDs, start, end)
+}
+
+// GetOrderGoodsNumber 获取商品下单数量
+func (m *StatisticsDAO) GetOrderGoodsNumber(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
+	return m.execMySQLFunc("fun_order_goods_num", orgID, caseIDs, start, end)
+}
+
+// GetCourseNumber 获取课程数量
+func (m *StatisticsDAO) GetCourseNumber(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
+	return m.execMySQLFunc("fun_total_course", orgID, caseIDs, start, end)
+}
+
+// GetArrivedCustomerNumber 获取到场人数
+func (m *StatisticsDAO) GetArrivedCustomerNumber(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
+	return m.execMySQLFunc("fun_arrived_customer", orgID, caseIDs, start, end)
+}
+
+// GetCourseCardCustomer 获取预约人数 - 含健身卡
+func (m *StatisticsDAO) GetCourseCardCustomer(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
+	return m.execMySQLFunc("fun_course_card_customer", orgID, caseIDs, start, end)
+}
+
+// GetCouponCardNumber 获取卡券总数
+func (m *StatisticsDAO) GetCouponCardNumber(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
+	return m.execMySQLFunc("fun_total_coupon_card", orgID, caseIDs, start, end)
+}
+
+// GetUsedCouponCardNumber 获取已使用卡券
+func (m *StatisticsDAO) GetUsedCouponCardNumber(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
+	return m.execMySQLFunc("fun_used_coupon_card", orgID, caseIDs, start, end)
+}
+
+// GetCustomerCouponCardNumber 获取已发放卡券总数
+func (m *StatisticsDAO) GetCustomerCouponCardNumber(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
+	return m.execMySQLFunc("fun_total_customer_coupon_card", orgID, caseIDs, start, end)
+}
+
+// StaCommData 折线图 或 柱图类数据
+type StaCommData struct {
+	Dt     string `json:"x"`
+	Amount int    `json:"y"`
+}
+
+// StaCommGroupData 折线图 或 柱图类数据 含分组
+type StaCommGroupData struct {
+	Dt     string `json:"x"`
+	Amount int    `json:"y"`
+	Group  string `json:"g"`
+}
+
+// StaPieData 饼图类数据
+type StaPieData struct {
+	Item    string  `json:"item"`
+	Amount  int     `json:"count"`
+	Percent float64 `json:"percent"`
+}
+
+// GetCourseOrderPie 获取预约课程
+func (m *StatisticsDAO) GetCourseOrderPie(orgID string, caseIDs []string, start, end *time.Time) ([]StaPieData, error) {
+	sql := `
+		SELECT
+			t.course_name AS item,
+			count(DISTINCT course_id) AS amount,
+			0.0 AS percent
+		FROM
+			ta_customer_course_detail t
+		WHERE
+			t.status = ?
+			AND t.org_id = ?
+	`
+	if caseIDs != nil && len(caseIDs) > 0 {
+		sql += ` AND t.case_id in ('` + strings.Join(caseIDs, "','") + `')`
+	}
+
+	startDate := ""
+	endDate := ""
+
+	if start != nil {
+		startDate = start.Format("2006-01-02 15:04:05")
+	}
+	if end != nil {
+		endDate = end.Format("2006-01-02 15:04:05")
+	}
+
+	if startDate != "" {
+		sql += ` AND DATE_FORMAT(t.start_date, '%Y-%m-%d %T') >= '` + startDate + `'`
+	}
+
+	if endDate != "" {
+		sql += ` AND DATE_FORMAT(t.start_date, '%Y-%m-%d %T') <= '` + endDate + `'`
+	}
+
+	sql += `		
+		GROUP BY
+			t.course_name
+	`
+
+	var data []StaPieData
+	if err := m.db.SQL(sql, models.STATUS_NORMAL, orgID).Find(&data); err != nil {
+		return nil, err
+	}
+
+	if data == nil || len(data) == 0 {
+		return nil, nil
+	}
+
+	total := 0
+	for _, dt := range data {
+		total += dt.Amount
+	}
+
+	if total != 0 {
+		for i := range data {
+			data[i].Percent = float64(data[i].Amount / total)
+		}
+	}
+
+	return data, nil
+}
+
+// GetNewCustomerDaily 按天统计新增会员
+func (m *StatisticsDAO) GetNewCustomerDaily(orgID string, caseIDs []string, staType string) ([]StaCommData, error) {
+	sql := `
+		SELECT
+			t.dt,
+			IFNULL(s.amount, 0) AS amount
+		FROM (
+	`
+
+	if staType == "week" {
+		sql += sqlThisWeek
+	} else {
+		sql += sqlThisMonth
+	}
+
+	sql += `) t
+		LEFT JOIN ta_sta_customer_daily s ON t.dt = s.sta_date
+		AND s.org_id = '` + orgID + `'
+	`
+
+	if caseIDs != nil && len(caseIDs) > 0 {
+		sql += ` AND case_id in ('` + strings.Join(caseIDs, "','") + `')`
+	}
+
+	var res []StaCommData
+	if err := m.db.SQL(sql).Find(&res); err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}
+
+// GetCourseDaily 按天统计排课数
+func (m *StatisticsDAO) GetCourseDaily(orgID string, caseIDs []string, staType string) ([]StaCommData, error) {
+	sql := `
+		SELECT
+			t.dt,
+			IFNULL(s.amount, 0) AS amount
+		FROM (
+	`
+
+	if staType == "week" {
+		sql += sqlThisWeek
+	} else {
+		sql += sqlThisMonth
+	}
+
+	sql += `) t
+		LEFT JOIN ta_sta_course_daily s ON t.dt = s.sta_date
+		AND s.org_id = '` + orgID + `'
+	`
+
+	if caseIDs != nil && len(caseIDs) > 0 {
+		sql += ` AND case_id in ('` + strings.Join(caseIDs, "','") + `')`
+	}
+
+	var res []StaCommData
+	if err := m.db.SQL(sql).Find(&res); err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}
+
+// GetCourseOrderDaily 按天统计课程预约数
+func (m *StatisticsDAO) GetCourseOrderDaily(orgID string, caseIDs []string, staType string) ([]StaCommData, error) {
+	sql := `
+		SELECT
+			t.dt,
+			sum(IFNULL(s.amount, 0)) AS amount
+		FROM (
+	`
+
+	if staType == "week" {
+		sql += sqlThisWeek
+	} else {
+		sql += sqlThisMonth
+	}
+
+	sql += `) t
+		LEFT JOIN ta_sta_course_order_daily s ON t.dt = s.sta_date
+		AND s.org_id = '` + orgID + `'
+	`
+
+	if caseIDs != nil && len(caseIDs) > 0 {
+		sql += ` AND case_id in ('` + strings.Join(caseIDs, "','") + `')`
+	}
+
+	sql += ` group by t.dt`
+
+	var res []StaCommData
+	if err := m.db.SQL(sql).Find(&res); err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}
+
+// GetGoodsDaily 按天统计饮品下单数
+func (m *StatisticsDAO) GetGoodsDaily(orgID string, caseIDs []string, staType string) ([]StaCommData, error) {
+	sql := `
+		SELECT
+			t.dt,
+			sum(IFNULL(s.amount, 0)) AS amount
+		FROM (
+	`
+
+	if staType == "week" {
+		sql += sqlThisWeek
+	} else {
+		sql += sqlThisMonth
+	}
+
+	sql += `) t
+		LEFT JOIN ta_sta_goods_daily s ON t.dt = s.sta_date
+		AND s.org_id = '` + orgID + `'
+	`
+
+	if caseIDs != nil && len(caseIDs) > 0 {
+		sql += ` AND case_id in ('` + strings.Join(caseIDs, "','") + `')`
+	}
+
+	sql += ` group by t.dt`
+
+	var res []StaCommData
+	if err := m.db.SQL(sql).Find(&res); err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}
+
+// GetGoodsWithTypeDaily 按天分组统计饮品下单数
+func (m *StatisticsDAO) GetGoodsWithTypeDaily(orgID string, caseIDs []string) ([]StaCommGroupData, error) {
+	sql := `
+		SELECT
+			t.dt,
+			s.type_name as group,
+			sum(IFNULL(s.amount, 0)) AS amount
+		FROM (
+	`
+
+	sql += sqlThisMonth + `) t
+		LEFT JOIN ta_sta_goods_daily s ON t.dt = s.sta_date
+		AND s.org_id = '` + orgID + `'
+	`
+
+	if caseIDs != nil && len(caseIDs) > 0 {
+		sql += ` AND case_id in ('` + strings.Join(caseIDs, "','") + `')`
+	}
+
+	sql += ` group by t.dt, s.type_name`
+
+	var res []StaCommGroupData
+	if err := m.db.SQL(sql).Find(&res); err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}
+
+// GetArrivedDaily 按天统计到场人次
+func (m *StatisticsDAO) GetArrivedDaily(orgID string, caseIDs []string, staType string) ([]StaCommData, error) {
+	sql := `
+		SELECT
+			t.dt,
+			IFNULL(s.amount, 0) AS amount
+		FROM (
+	`
+
+	if staType == "week" {
+		sql += sqlThisWeek
+	} else {
+		sql += sqlThisMonth
+	}
+
+	sql += `) t
+		LEFT JOIN ta_sta_arrived_daily s ON t.dt = s.sta_date
+		AND s.org_id = '` + orgID + `'
+	`
+
+	if caseIDs != nil && len(caseIDs) > 0 {
+		sql += ` AND case_id in ('` + strings.Join(caseIDs, "','") + `')`
+	}
+
+	sql += ` group by t.dt`
+
+	var res []StaCommData
+	if err := m.db.SQL(sql).Find(&res); err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}
+
+// execMySQLFunc 执行 mysql 函数
+func (m *StatisticsDAO) execMySQLFunc(funName, orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
+	csids := ""
+	if caseIDs == nil && len(caseIDs) == 0 {
+		csids = strings.Join(caseIDs, ",")
+	}
+
+	startDate := ""
+	endDate := ""
+
+	if start != nil {
+		startDate = start.Format("2006-01-02 15:04:05")
+	}
+	if end != nil {
+		endDate = end.Format("2006-01-02 15:04:05")
+	}
+
+	sql := "select " + funName + "(?,?,?,?) as total"
+	res, err := m.db.Query(sql, orgID, csids, startDate, endDate)
+	if err != nil {
+		return 0, err
+	}
+
+	if res == nil || len(res) == 0 {
+		return 0, nil
+	}
+
+	total, _ := strconv.ParseInt(string(res[0]["total"]), 10, 64)
+	return total, nil
+}

models/statistics/goods.go

@@ -63,7 +63,7 @@ func (m *StatisticsDAO) GetGoodsStatistics(caseids, typeid, name string, page, p
 }
 
 // GetGoodsStatisticsCount 获取总数
-func (m *StatisticsDAO) GetGoodsStatisticsCount(caseids, typeid, name string) (int, error) {
+func (m *StatisticsDAO) GetGoodsStatisticsCount(caseids, typeid, name string) ([]GoodsStatistics, error) {
 	var goods []GoodsStatistics
 	sql := `SELECT
 					e.case_name,
@@ -103,7 +103,7 @@ func (m *StatisticsDAO) GetGoodsStatisticsCount(caseids, typeid, name string) (i
 					c.type_name,
 					b.price`
 	err := m.db.Sql(sql).Find(&goods)
-	return len(goods), err
+	return goods, err
 }
 
 // GoodsOrdersStatistics 商品订单统计信息
@@ -120,6 +120,7 @@ type GoodsOrdersStatistics struct {
 	CustomerName string
 	Phone        string
 	Name         string
+	Remark       string
 	Details      []model.TaGoodsOrdersDetail
 }
 
@@ -138,7 +139,8 @@ func (m *StatisticsDAO) GetGoodsOrderStatistics(status, usertype, caseids, begin
 						a.table_no,
 						c.customer_name,
 						c. NAME,
-						c.phone
+						c.phone,
+						a.remark
 					FROM
 						ta_goods_orders a
 					INNER JOIN ta_customer b ON a.user_id = b.customer_id
@@ -176,7 +178,7 @@ func (m *StatisticsDAO) GetGoodsOrderStatistics(status, usertype, caseids, begin
 }
 
 // GetGoodsOrderStatisticsCount 获取商品订单Count
-func (m *StatisticsDAO) GetGoodsOrderStatisticsCount(status, usertype, caseids, begindate, enddate string) (int, error) {
+func (m *StatisticsDAO) GetGoodsOrderStatisticsCount(status, usertype, caseids, begindate, enddate string) ([]GoodsOrdersStatistics, error) {
 	var orders []GoodsOrdersStatistics
 	sql := `SELECT
 						a.orders_id,
@@ -190,7 +192,8 @@ func (m *StatisticsDAO) GetGoodsOrderStatisticsCount(status, usertype, caseids,
 						a.table_no,
 						c.customer_name,
 						c. NAME,
-						c.phone
+						c.phone,
+						a.remark
 					FROM
 						ta_goods_orders a
 					INNER JOIN ta_customer b ON a.user_id = b.customer_id
@@ -212,5 +215,5 @@ func (m *StatisticsDAO) GetGoodsOrderStatisticsCount(status, usertype, caseids,
 	}
 
 	err := m.db.Sql(sql).Find(&orders)
-	return len(orders), err
+	return orders, err
 }

models/statistics/statistics.go

@@ -2,9 +2,6 @@ package statistics
 
 import (
 	"spaceofcheng/services/utils"
-	"strconv"
-	"strings"
-	"time"
 
 	"github.com/go-xorm/xorm"
 )
@@ -22,84 +19,3 @@ func NewStatisticsDAO(ctx *utils.Context) *StatisticsDAO {
 		db:  ctx.DB,
 	}
 }
-
-// GetCustomerNumber 获取会员数量
-func (m *StatisticsDAO) GetCustomerNumber(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
-	return m.execMySQLFunc("fun_total_customer", orgID, caseIDs, start, end)
-}
-
-// GetCourseOrderNumber 获取课程预约 - 统计课程
-func (m *StatisticsDAO) GetCourseOrderNumber(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
-	return m.execMySQLFunc("fun_course_order", orgID, caseIDs, start, end)
-}
-
-// GetCourseOrderCustomer 获取课程预约 - 统计人员
-func (m *StatisticsDAO) GetCourseOrderCustomer(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
-	return m.execMySQLFunc("fun_course_order_customer", orgID, caseIDs, start, end)
-}
-
-// GetOrderGoodsNumber 获取商品下单数量
-func (m *StatisticsDAO) GetOrderGoodsNumber(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
-	return m.execMySQLFunc("fun_order_goods_num", orgID, caseIDs, start, end)
-}
-
-// GetCourseNumber 获取课程数量
-func (m *StatisticsDAO) GetCourseNumber(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
-	return m.execMySQLFunc("fun_total_course", orgID, caseIDs, start, end)
-}
-
-// GetArrivedCustomerNumber 获取到场人数
-func (m *StatisticsDAO) GetArrivedCustomerNumber(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
-	return m.execMySQLFunc("fun_arrived_customer", orgID, caseIDs, start, end)
-}
-
-// GetCourseCardCustomer 获取预约人数 - 含健身卡
-func (m *StatisticsDAO) GetCourseCardCustomer(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
-	return m.execMySQLFunc("fun_course_card_customer", orgID, caseIDs, start, end)
-}
-
-// GetCouponCardNumber 获取卡券总数
-func (m *StatisticsDAO) GetCouponCardNumber(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
-	return m.execMySQLFunc("fun_total_coupon_card", orgID, caseIDs, start, end)
-}
-
-// GetUsedCouponCardNumber 获取已使用卡券
-func (m *StatisticsDAO) GetUsedCouponCardNumber(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
-	return m.execMySQLFunc("fun_used_coupon_card", orgID, caseIDs, start, end)
-}
-
-// GetCustomerCouponCardNumber 获取已发放卡券总数
-func (m *StatisticsDAO) GetCustomerCouponCardNumber(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
-	return m.execMySQLFunc("fun_total_customer_coupon_card", orgID, caseIDs, start, end)
-}
-
-// execMySQLFunc 执行 mysql 函数
-func (m *StatisticsDAO) execMySQLFunc(funName, orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
-	csids := ""
-	if caseIDs == nil && len(caseIDs) == 0 {
-		csids = strings.Join(caseIDs, ",")
-	}
-
-	startDate := ""
-	endDate := ""
-
-	if start != nil {
-		startDate = start.Format("2006-01-02 15:04:05")
-	}
-	if end != nil {
-		endDate = end.Format("2006-01-02 15:04:05")
-	}
-
-	sql := "select " + funName + "(?,?,?,?) as total"
-	res, err := m.db.Query(sql, orgID, csids, startDate, endDate)
-	if err != nil {
-		return 0, err
-	}
-
-	if res == nil || len(res) == 0 {
-		return 0, nil
-	}
-
-	total, _ := strconv.ParseInt(string(res[0]["total"]), 10, 64)
-	return total, nil
-}

routers/common.go

@@ -11,7 +11,6 @@ import (
 	"spaceofcheng/services/controllers/customer"
 	"spaceofcheng/services/controllers/goods"
 	"spaceofcheng/services/controllers/gymcard"
-	"spaceofcheng/services/controllers/luckdrawlist"
 	"spaceofcheng/services/controllers/marketing"
 	"spaceofcheng/services/controllers/message"
 	"spaceofcheng/services/controllers/statistics"
@@ -52,6 +51,10 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/signout", &user.UserController{}, "post:SignOut"),
 		beego.NSRouter("/user/tel/:tel", &user.UserController{}, "get:GetUserByTel"),
 
+		// Dashboard
+		beego.NSRouter("/dashboard", &statistics.StatisticsController{}, "get:GetDashData"),
+		beego.NSRouter("/dashboard/charts", &statistics.StatisticsController{}, "get:GetDashFilterCharts"),
+
 		// 用户类型
 		beego.NSRouter("/usertype", &user.UserController{}, "get:GetUserTypes"),
 
@@ -184,10 +187,11 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/gymcard/:id/to/:users", &gymcard.GymcardController{}, "post:GiveGymToCustomer"),
 
 		// luckdrawlist 抽奖
-		beego.NSRouter("luckdrawlist", &luckdrawlist.LuckdrawlistController{}, "get:GetLuckdrawList"),
-		beego.NSRouter("luckdrawlist/:toPhone/:fromPhone", &luckdrawlist.LuckdrawlistController{}, "get:GetLuckShareList"),
-		beego.NSRouter("luckdrawlist/:luckdrawId", &luckdrawlist.LuckdrawlistController{}, "get:GetVerifyList"),
-		beego.NSRouter("luckdrawlist/:luckdrawId", &luckdrawlist.LuckdrawlistController{}, "put:VerifyLuckdraw"),
+		// beego.NSRouter("luckdrawlist", &luckdrawlist.LuckdrawlistController{}, "get:GetLuckdrawList"),
+		// beego.NSRouter("luckdrawlist/:toPhone/:fromPhone", &luckdrawlist.LuckdrawlistController{}, "get:GetLuckShareList"),
+		// beego.NSRouter("luckdrawlist/:luckdrawId", &luckdrawlist.LuckdrawlistController{}, "get:GetVerifyList"),
+		// beego.NSRouter("luckdrawlist/:luckdrawId", &luckdrawlist.LuckdrawlistController{}, "put:VerifyLuckdraw"),
+
 		// bodychecklist 体检列表
 		beego.NSRouter("bodychecklist", &bodychecklist.BodychecklistController{}, "get:GetBodyCheckList"),
 		// role 角色
@@ -280,11 +284,18 @@ func getCommonRoutes() beego.LinkNamespace {
 
 		// 统计类
 		beego.NSRouter("/statistics/goods", &statistics.StatisticsController{}, "get:GetGoodsStatistics"),
+		beego.NSRouter("/statistics/goods/excel", &statistics.StatisticsController{}, "get:GetGoodsStatisticsExcel"),
 		beego.NSRouter("/statistics/goodsorders", &statistics.StatisticsController{}, "get:GetGoodsOrdersStatistics"),
+		beego.NSRouter("/statistics/goodsorders/excel", &statistics.StatisticsController{}, "get:GetGoodsOrdersStatisticsExcel"),
 		beego.NSRouter("/statistics/courseorders", &statistics.StatisticsController{}, "get:GetCourseOrdersStatistics"),
+		beego.NSRouter("/statistics/courseorders/excel", &statistics.StatisticsController{}, "get:GetCourseOrdersStatisticsExcel"),
 		beego.NSRouter("/statistics/courses", &statistics.StatisticsController{}, "get:GetCourseStatistics"),
+		beego.NSRouter("/statistics/courses/excel", &statistics.StatisticsController{}, "get:GetCourseStatisticsExcel"),
 		beego.NSRouter("/statistics/cardcoupon", &statistics.StatisticsController{}, "get:CardCouponStatistics"),
+		beego.NSRouter("/statistics/cardcoupon/excel", &statistics.StatisticsController{}, "get:CardCouponStatisticsExcel"),
 		beego.NSRouter("/statistics/cardcouponused", &statistics.StatisticsController{}, "get:CardCouponUsedStatistics"),
+		beego.NSRouter("/statistics/cardcouponused/excel", &statistics.StatisticsController{}, "get:CardCouponUsedStatisticsExcel"),
 		beego.NSRouter("/statistics/cardcouponverify", &statistics.StatisticsController{}, "get:CardCouponVerifyStatistics"),
+		beego.NSRouter("/statistics/cardcouponverify/excel", &statistics.StatisticsController{}, "get:CardCouponVerifyStatisticsExcel"),
 	)
 }

routers/guest.go

@@ -1,6 +1,7 @@
 package routers
 
 import (
+	"cdkj-check/controllers/bodycheck"
 	"spaceofcheng/services/controllers"
 	"spaceofcheng/services/controllers/cases"
 	"spaceofcheng/services/controllers/course"
@@ -57,5 +58,8 @@ func getGuestRoutes() beego.LinkNamespace {
 		beego.NSRouter("/wechat/mini/decodedata", &controllers.BaseController{}, "post:DecodeMiniData"),
 
 		beego.NSRouter("/websocket/:grps/:id", &controllers.BaseController{}, "get:Ws"),
+
+		// 体检参数接收
+		beego.NSRouter("/PostCheckResult", &bodycheck.BodyCheckController{}, "post:PostCheckResult"),
 	)
 }

routers/wechat.go

@@ -77,12 +77,12 @@ func getWechatRoutes() beego.LinkNamespace {
 		beego.NSRouter("/GetQrcodeURL", &bodycheck.BodyCheckController{}, "get:GetQrcodeURL"),
 
 		// 抽奖
-		beego.NSRouter("/user", &luckdraw.LuckDrawController{}, "get:GetUserByCode"),
-		beego.NSRouter("/luckdraw/:id", &luckdraw.LuckDrawController{}, "get:GetLuckDraw"),
-		beego.NSRouter("/luckdraw/:id", &luckdraw.LuckDrawController{}, "post:LuckDraw"),
-		beego.NSRouter("/luckdraw/:id/share", &luckdraw.LuckDrawController{}, "post:SaveShareRecord"),
-		beego.NSRouter("/record", &luckdraw.LuckDrawController{}, "get:GetRecordByLuckDraw"),
-		beego.NSRouter("/user/record", &luckdraw.LuckDrawController{}, "get:GetUserLuckDraw"),
-		beego.NSRouter("/user/record/:id", &luckdraw.LuckDrawController{}, "get:GetRecordByID"),
+		// beego.NSRouter("/user", &luckdraw.LuckDrawController{}, "get:GetUserByCode"),
+		// beego.NSRouter("/luckdraw/:id", &luckdraw.LuckDrawController{}, "get:GetLuckDraw"),
+		// beego.NSRouter("/luckdraw/:id", &luckdraw.LuckDrawController{}, "post:LuckDraw"),
+		// beego.NSRouter("/luckdraw/:id/share", &luckdraw.LuckDrawController{}, "post:SaveShareRecord"),
+		// beego.NSRouter("/record", &luckdraw.LuckDrawController{}, "get:GetRecordByLuckDraw"),
+		// beego.NSRouter("/user/record", &luckdraw.LuckDrawController{}, "get:GetUserLuckDraw"),
+		// beego.NSRouter("/user/record/:id", &luckdraw.LuckDrawController{}, "get:GetRecordByID"),
 	)
 }

service/bodycheck/bodycheck.go

@@ -3,130 +3,214 @@ package bodycheck
 import (
 	"errors"
 	"spaceofcheng/services/models/bodycheck"
+	"spaceofcheng/services/models/customer"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
+	"time"
+
+	"github.com/astaxie/beego"
+	"github.com/astaxie/beego/config"
+	"github.com/zjxpcyc/wechat/wx"
 )
 
-// BodycheckServ 系统处理
-type BodycheckServ struct {
-	ctx *utils.Context
-	dao *bodycheck.DAO
+// BodyCheckServ 系统处理
+type BodyCheckServ struct {
+	ctx         *utils.Context
+	dao         *bodycheck.DAO
+	customerdao *customer.CustomerDAO
 }
 
-// NewBodycheckServ 初始化
-func NewBodycheckServ(ctx *utils.Context) *BodycheckServ {
-	return &BodycheckServ{
-		ctx: ctx,
-		dao: bodycheck.NewDAO(ctx),
+// NewBodyCheckServ 初始化
+func NewBodyCheckServ(ctx *utils.Context) *BodyCheckServ {
+	return &BodyCheckServ{
+		ctx:         ctx,
+		dao:         bodycheck.NewDAO(ctx),
+		customerdao: customer.NewCustomerDAO(ctx),
 	}
 }
-func (s *BodycheckServ) GetBodyCheckByUser(userID string) ([]model.TaBodyCheck, error) {
-	bodychecks, err := s.dao.GetBodyCheckByUser(userID)
-	if err != nil {
-		utils.LogError("查询用户体检信息失败: " + err.Error())
-		return nil, errors.New("查询用户体检信息失败")
-	}
-	return bodychecks, nil
-}
-func (s *BodycheckServ) GetCheckSpecs() ([]model.TdCheckSpec, error) {
-	specs, err := s.dao.GetCheckSpecs()
+
+// GetCheckByUser 根据用户获取体检报告
+func (s *BodyCheckServ) GetCheckByUser() (map[string]interface{}, error) {
+	customer := s.ctx.Get("customer").(model.TaCustomer)
+	bodyCheck, err := s.dao.GetBodyCheckByUser(customer.CustomerId)
 	if err != nil {
-		utils.LogError("获取项目指标信息失败: " + err.Error())
-		return nil, errors.New("获取项目指标信息失败")
+		return nil, err
 	}
-	return specs, nil
-}
-func (s *BodycheckServ) GetCheckByUserAndEquipmentID(userID string, EquipmentID string) (*model.TaBodyCheck, error) {
-	check, err := s.dao.GetCheckByUserAndEquipmentID(userID, EquipmentID)
-	if err != nil {
-		utils.LogError("根据用户与设备ID获取体检信息失败: " + err.Error())
-		return nil, errors.New("根据用户与设备ID获取体检信息失败")
+	if len(bodyCheck) == 0 {
+		return nil, errors.New("没有查询到数据")
 	}
-	return check, nil
-}
-func (s *BodycheckServ) SaveBodyCheckInfo(checkNew model.TaBodyCheck) (*model.TaBodyCheck, error) {
-	checkNews, err := s.dao.SaveBodyCheckInfo(checkNew)
+	presentations, err := s.dao.GetPresentationByCheckID(bodyCheck[0].Id)
 	if err != nil {
-		utils.LogError("用户体检信息新增失败: " + err.Error())
-		return nil, errors.New("用户体检信息新增失败")
+		return nil, err
 	}
-	return checkNews, nil
+
+	return map[string]interface{}{
+		"Message":  presentations,
+		"Info":     bodyCheck,
+		"UserInfo": customer,
+	}, nil
 }
-func (s *BodycheckServ) GetCaseEquipment(EquipmentID string) (*model.TaCaseEquipment, error) {
-	caseEquipment, err := s.dao.GetCaseEquipment(EquipmentID)
-	if err != nil {
-		utils.LogError("获取设备案场信息失败: " + err.Error())
-		return nil, errors.New("获取设备案场信息失败")
+
+// PostCheckResult 测量结果返回
+func (s *BodyCheckServ) PostCheckResult(formVal map[string]interface{}) error {
+	type CheckResult struct {
+		WechatAccount string
+		EquipmentId   string
+		CheckType     int
+		CheckDate     time.Time
+		CheckResult   string
+		ReportUrl     string
+		HMSReportUrl  string
 	}
-	return caseEquipment, nil
-}
-func (s *BodycheckServ) GetUserByOpenID(openid string) (*model.TaCustomer, error) {
-	customer, err := s.dao.GetUserByOpenID(openid)
+	var result = CheckResult{}
+
+	result.EquipmentId = formVal["EquipmentId"].(string)
+	result.WechatAccount = formVal["WechatAccount"].(string)
+	// result.CheckResult = formVal["CheckResult"].(string)
+	result.CheckResult = ""
+	result.ReportUrl = formVal["ReportUrl"].(string)
+	result.HMSReportUrl = formVal["HMSReportUrl"].(string)
+	result.CheckType = int(formVal["CheckType"].(float64))
+
+	var err error
+	loc, _ := time.LoadLocation("Local")
+	result.CheckDate, err = time.ParseInLocation("2006-01-02 15:04:05", formVal["CheckDate"].(string), loc)
 	if err != nil {
-		utils.LogError("根据openid获取用户信息失败: " + err.Error())
-		return nil, errors.New("根据openid获取用户信息失败")
+		utils.LogError("参数错误：", err)
+		return errors.New("参数错误")
 	}
-	return customer, nil
-}
 
-func (s *BodycheckServ) GetPresentationByCheckID(checkID int) ([]bodycheck.Presentation, error) {
-	presentations, err := s.dao.GetPresentationByCheckID(checkID)
+	openid := result.WechatAccount
+	customer, err := s.customerdao.GetCustWithWXByOpenID(openid)
 	if err != nil {
-		utils.LogError("根据体检ID获取项目信息失败: " + err.Error())
-		return nil, errors.New("根据体检ID获取项目信息失败")
+		utils.LogError("获取用户信息失败：", err)
+		return errors.New("获取用户信息失败")
 	}
-	return presentations, nil
-}
-
-func (s *BodycheckServ) GetDetailsByPresentID(ID int) ([]model.TaPresentationDetail, error) {
-	detail, err := s.dao.GetDetailsByPresentID(ID)
+	if customer == nil || customer.CustomerId == "" {
+		return errors.New("没有当前用户信息！")
+	}
+	userid := customer.CustomerId
+	checkinfo, err := s.dao.GetCheckByUserAndEquipmentID(userid, result.EquipmentId)
 	if err != nil {
-		utils.LogError("根据项目ID获取详情失败: " + err.Error())
-		return nil, errors.New("根据项目ID获取详情失败")
+		utils.LogError("获取体检信息失败：", err)
+		return errors.New("获取体检信息失败")
 	}
-	return detail, nil
-}
 
-func (s *BodycheckServ) GetPresentation(checkID, typeID int) (*model.TaPresentation, error) {
-	presentation, err := s.dao.GetPresentation(checkID, typeID)
-	if err != nil {
-		utils.LogError("获取体检项目信息失败: " + err.Error())
-		return nil, errors.New("获取体检项目信息失败")
+	if checkinfo == nil || checkinfo.Id != "" || time.Now().Local().Format("2006-01-02") != checkinfo.CreateDate.Format("2006-01-02") {
+		caseEquipment, err := s.dao.GetCaseEquipment(result.EquipmentId)
+		if err != nil {
+			utils.LogError("获取设备信息失败：", err)
+			return errors.New("获取设备信息失败")
+		}
+		if caseEquipment == nil || caseEquipment.Id == "" {
+			return errors.New("设备未维护！")
+		}
+
+		var checkNew = model.TaBodyCheck{}
+		checkNew.CaseId = caseEquipment.CaseId
+		checkNew.EquipmentId = result.EquipmentId
+		checkNew.UserId = userid
+		checkNew.ReportUrl = result.HMSReportUrl
+		checkNew.CreateDate = result.CheckDate
+		checkinfo, err = s.dao.SaveBodyCheckInfo(checkNew)
+
+		wxconf, _ := config.NewConfig("ini", "conf/wechat.conf")
+		messageTplID := wxconf.String("messageTplID")
+
+		org := s.ctx.Get("org").(model.SysOrg)
+
+		utils.WxClientFor(org.OrgId).SendTplMessage(result.WechatAccount, messageTplID, beego.AppConfig.String("resultURL"), map[string]wx.TplMessageData{
+			"first": wx.TplMessageData{
+				Value: "您的体检报告已生成",
+			},
+			"keyword1": wx.TplMessageData{
+				Value: checkinfo.Id,
+			},
+			"keyword2": wx.TplMessageData{
+				Value: result.CheckDate.Format("2006-01-02 15:04"),
+			},
+			"remark": wx.TplMessageData{
+				Value: "",
+			},
+		})
 	}
-	return presentation, nil
-}
 
-func (s *BodycheckServ) SavePresentation(info model.TaPresentation) (*model.TaPresentation, error) {
-	presentation, err := s.dao.SavePresentation(info)
+	presentation, err := s.dao.GetPresentation(checkinfo.Id, result.CheckType)
 	if err != nil {
-		utils.LogError("新增体检项目信息失败: " + err.Error())
-		return nil, errors.New("新增体检项目信息失败")
+		utils.LogError("获取报告明细失败：", err)
+		return errors.New("获取报告明细失败")
 	}
-	return presentation, err
-}
-func (s *BodycheckServ) UpdatePresentation(info *model.TaPresentation) error {
-	err := s.dao.UpdatePresentation(info)
-	if err != nil {
-		utils.LogError("更新体检项目信息失败: " + err.Error())
-		return errors.New("更新体检项目信息失败")
+	if presentation == nil || presentation.Id != "" {
+		// 新增
+		var preNew = model.TaPresentation{}
+		preNew.CheckId = checkinfo.Id
+		preNew.CheckDate = result.CheckDate
+		preNew.CheckResult = result.CheckResult
+		preNew.CheckType = result.CheckType
+		preNew.ReportUrl = result.ReportUrl
+		presentation, err = s.dao.SavePresentation(preNew)
+		if err != nil {
+			utils.LogError("保存报告明细失败：", err)
+			return errors.New("保存报告明细失败")
+		}
+	} else {
+		// 修改
+		presentation.CheckDate = result.CheckDate
+		presentation.CheckResult = result.CheckResult
+		presentation.ReportUrl = result.ReportUrl
+		err = s.dao.UpdatePresentation(presentation)
+		if err != nil {
+			utils.LogError("修改报告明细失败：", err)
+			return errors.New("修改报告明细失败")
+		}
+		// 删除之前的记录
+		err = s.dao.DeletePresentionDetail(presentation.Id)
+		if err != nil {
+			utils.LogError("删除报告明细失败：", err)
+			return errors.New("删除报告明细失败")
+		}
 	}
-	return nil
-}
 
-func (s *BodycheckServ) SavePresentationDetail(details []model.TaPresentationDetail) error {
-	err := s.dao.SavePresentationDetail(details)
+	specs, err := s.dao.GetCheckSpecs()
 	if err != nil {
-		utils.LogError("保存体检项目明细失败: " + err.Error())
-		return errors.New("保存体检项目明细失败")
+		utils.LogError("获取spec信息失败：", err)
+		return errors.New("获取spec信息失败")
 	}
-	return nil
 
-}
-func (s *BodycheckServ) DeletePresentionDetail(ID int) error {
-	err := s.dao.DeletePresentionDetail(ID)
-	if err != nil {
-		utils.LogError("根据项目ID删除明细信息失败: " + err.Error())
-		return errors.New("根据项目ID删除明细信息失败")
+	if len(formVal) > 0 {
+		var details []model.TaPresentationDetail
+		for k, v := range formVal {
+			if k != "WechatAccount" && k != "EquipmentId" && k != "CheckType" && k != "CheckDate" && k != "CheckResult" && k != "ReportUrl" && k != "HMSReportUrl" && k != "WXID" {
+				var detail model.TaPresentationDetail
+				detail.CheckName = k
+				switch vx := v.(type) {
+				case string:
+					detail.CheckVal = vx
+				case float64:
+					detail.CheckVal = strconv.FormatFloat(vx, 'f', 2, 64)
+				}
+
+				detail.PresentationId = presentation.Id
+				var specName = ""
+				for _, spec := range specs {
+					if spec.SortName == k {
+						specName = spec.Name
+						break
+					}
+				}
+				detail.SpecName = specName
+				detail.Id = utils.GetGUID()
+				details = append(details, detail)
+			}
+		}
+		if len(details) > 0 {
+			err := s.dao.SavePresentationDetail(details)
+			if err != nil {
+				utils.LogError("保存体检明细失败：", err)
+				return errors.New("保存体检明细失败")
+			}
+		}
 	}
 	return nil
 }

service/card/card.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/card"
+	"spaceofcheng/services/models/coupon"
 	"spaceofcheng/services/models/course"
 	"spaceofcheng/services/models/customer"
 	"spaceofcheng/services/models/model"
@@ -23,6 +24,7 @@ type CardServ struct {
 	custDao   *customer.CustomerDAO
 	userDao   *system.UserDAO
 	courseDao *course.CourseDAO
+	coupondao *coupon.CouponDAO
 }
 
 // NewCardServ 初始化
@@ -33,6 +35,7 @@ func NewCardServ(ctx *utils.Context) *CardServ {
 		custDao:   customer.NewCustomerDAO(ctx),
 		userDao:   system.NewUserDAO(ctx),
 		courseDao: course.NewCourseDAO(ctx),
+		coupondao: coupon.NewCouponDAO(ctx),
 	}
 }
 
@@ -195,6 +198,7 @@ func (s *CardServ) GiveCard(CardID string, uids []string) error {
 		if err := s.GiveCardTo(&user, cust, card); err != nil {
 			return err
 		}
+
 	}
 
 	return nil
@@ -246,12 +250,29 @@ func (s *CardServ) GiveCardTo(from *model.SysUser, to *model.TaCustomer, card *c
 		Price:            card.Price,
 	}
 
+	// 放入赠送记录
+	rec := model.TaCouponGiveRecord{
+		GiftType:   models.GIVE_GIFT_COUPON,
+		GiftId:     card.CardId,
+		GiftName:   card.CardName,
+		FromId:     from.UserId,
+		FromName:   from.UserName,
+		ToId:       to.CustomerId,
+		ToName:     to.CustomerName,
+		CreateDate: time.Now().Local(),
+	}
+
 	// 入库
 	if err := s.dao.SaveCustomerCards([]model.TaCustomerCard{custcard}); err != nil {
 		utils.LogError("保存客户卡失败: " + err.Error())
 		return errors.New("保存客户卡失败")
 	}
 
+	if err := s.coupondao.SaveCouponRecoreds([]model.TaCouponGiveRecord{rec}); err != nil {
+		utils.LogError("保存卡赠送记录失败: " + err.Error())
+		return errors.New("保存卡赠送记录失败")
+	}
+
 	// 加入我的课程信息
 	err := s.SaveCustomerCourseByCard(&custcard)
 	if err != nil {

service/statistics/cardcoupon.go

@@ -2,6 +2,7 @@ package statistics
 
 import (
 	"errors"
+	"spaceofcheng/services/models/statistics"
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
 )
@@ -24,7 +25,7 @@ func (s *StatisticsServ) CardCouponStatistics(caseids, ctype, name string, page,
 		utils.LogError("获取卡券统计数据失败: " + err.Error())
 		return nil, errors.New("获取卡券统计数据失败")
 	}
-	total, err := s.dao.CardCouponStatisticsCount(caseids, ctype, name)
+	all, err := s.dao.CardCouponStatisticsCount(caseids, ctype, name)
 	if err != nil {
 		utils.LogError("获取卡券统计数据失败: " + err.Error())
 		return nil, errors.New("获取卡券统计数据失败")
@@ -33,11 +34,26 @@ func (s *StatisticsServ) CardCouponStatistics(caseids, ctype, name string, page,
 	return map[string]interface{}{
 		"list":     list,
 		"pagesize": pageSize,
-		"pagenum":  total,
+		"pagenum":  len(all),
 		"page":     page,
 	}, nil
 }
 
+// CardCouponStatisticsExcel 导出
+func (s *StatisticsServ) CardCouponStatisticsExcel(caseids, ctype, name string) ([]statistics.CardCouponStatistics, error) {
+	if caseids == "" {
+		return nil, errors.New("请先选择案场信息")
+	}
+
+	all, err := s.dao.CardCouponStatisticsCount(caseids, ctype, name)
+	if err != nil {
+		utils.LogError("获取卡券统计数据失败: " + err.Error())
+		return nil, errors.New("获取卡券统计数据失败")
+	}
+
+	return all, nil
+}
+
 // CardCouponUsedStatistics 获取卡券使用统计信息
 func (s *StatisticsServ) CardCouponUsedStatistics(caseids, tel, name, receivetype, begindate, enddate, status string, page, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
@@ -56,7 +72,7 @@ func (s *StatisticsServ) CardCouponUsedStatistics(caseids, tel, name, receivetyp
 		utils.LogError("获取卡券统计数据失败: " + err.Error())
 		return nil, errors.New("获取卡券统计数据失败")
 	}
-	total, err := s.dao.CardCouponUsedCountStatistics(caseids, tel, name, receivetype, begindate, enddate, status)
+	all, err := s.dao.CardCouponUsedCountStatistics(caseids, tel, name, receivetype, begindate, enddate, status)
 	if err != nil {
 		utils.LogError("获取卡券统计数据失败: " + err.Error())
 		return nil, errors.New("获取卡券统计数据失败")
@@ -65,12 +81,22 @@ func (s *StatisticsServ) CardCouponUsedStatistics(caseids, tel, name, receivetyp
 	return map[string]interface{}{
 		"list":     list,
 		"pagesize": pageSize,
-		"pagenum":  total,
+		"pagenum":  len(all),
 		"page":     page,
 	}, nil
 }
 
-// CardCouponVerifyStatistics 获取卡券使用统计信息
+// CardCouponUsedStatisticsExcel 卡券使用数据导出
+func (s *StatisticsServ) CardCouponUsedStatisticsExcel(caseids, tel, name, receivetype, begindate, enddate, status string) ([]statistics.CardCouponUsedStatistics, error) {
+	all, err := s.dao.CardCouponUsedCountStatistics(caseids, tel, name, receivetype, begindate, enddate, status)
+	if err != nil {
+		utils.LogError("获取卡券统计数据失败: " + err.Error())
+		return nil, errors.New("获取卡券统计数据失败")
+	}
+	return all, nil
+}
+
+// CardCouponVerifyStatistics 获取卡券核销统计信息
 func (s *StatisticsServ) CardCouponVerifyStatistics(caseids, tel, name, status string, page, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
@@ -88,7 +114,7 @@ func (s *StatisticsServ) CardCouponVerifyStatistics(caseids, tel, name, status s
 		utils.LogError("获取卡券统计数据失败: " + err.Error())
 		return nil, errors.New("获取卡券统计数据失败")
 	}
-	total, err := s.dao.CardCouponVerifyStatisticsCount(caseids, tel, name, status)
+	all, err := s.dao.CardCouponVerifyStatisticsCount(caseids, tel, name, status)
 	if err != nil {
 		utils.LogError("获取卡券统计数据失败: " + err.Error())
 		return nil, errors.New("获取卡券统计数据失败")
@@ -97,7 +123,20 @@ func (s *StatisticsServ) CardCouponVerifyStatistics(caseids, tel, name, status s
 	return map[string]interface{}{
 		"list":     list,
 		"pagesize": pageSize,
-		"pagenum":  total,
+		"pagenum":  len(all),
 		"page":     page,
 	}, nil
 }
+
+// CardCouponVerifyStatisticsExcel 卡券核销统计导出
+func (s *StatisticsServ) CardCouponVerifyStatisticsExcel(caseids, tel, name, status string) ([]statistics.CardCouponVerifyStatistics, error) {
+	if caseids == "" {
+		return nil, errors.New("请先选择案场信息")
+	}
+	all, err := s.dao.CardCouponVerifyStatisticsCount(caseids, tel, name, status)
+	if err != nil {
+		utils.LogError("获取卡券统计数据失败: " + err.Error())
+		return nil, errors.New("获取卡券统计数据失败")
+	}
+	return all, nil
+}

service/statistics/course.go

@@ -2,6 +2,7 @@ package statistics
 
 import (
 	"errors"
+	"spaceofcheng/services/models/statistics"
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
 )
@@ -24,7 +25,7 @@ func (s *StatisticsServ) GetCourseOrdersStatistics(typeid, caseids, name, begind
 		utils.LogError("获取课程订单统计数据失败: " + err.Error())
 		return nil, errors.New("获取课程订单统计数据失败")
 	}
-	total, err := s.dao.GetCourseOrdersStatisticsCount(typeid, caseids, name, begindate, enddate)
+	all, err := s.dao.GetCourseOrdersStatisticsCount(typeid, caseids, name, begindate, enddate)
 	if err != nil {
 		utils.LogError("获取课程订单统计数据失败: " + err.Error())
 		return nil, errors.New("获取课程订单统计数据失败")
@@ -33,11 +34,24 @@ func (s *StatisticsServ) GetCourseOrdersStatistics(typeid, caseids, name, begind
 	return map[string]interface{}{
 		"list":     list,
 		"pagesize": pageSize,
-		"pagenum":  total,
+		"pagenum":  len(all),
 		"page":     page,
 	}, nil
 }
 
+// GetCourseOrdersStatisticsExcel 课程订单导出
+func (s *StatisticsServ) GetCourseOrdersStatisticsExcel(typeid, caseids, name, begindate, enddate string) ([]statistics.CourseOrdersStatistics, error) {
+	if caseids == "" {
+		return nil, errors.New("请先选择案场信息")
+	}
+	all, err := s.dao.GetCourseOrdersStatisticsCount(typeid, caseids, name, begindate, enddate)
+	if err != nil {
+		utils.LogError("获取课程订单统计数据失败: " + err.Error())
+		return nil, errors.New("获取课程订单统计数据失败")
+	}
+	return all, nil
+}
+
 // GetCourseStatistics 获取课程统计信息
 func (s *StatisticsServ) GetCourseStatistics(typeid, caseids, name string, page, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
@@ -56,7 +70,7 @@ func (s *StatisticsServ) GetCourseStatistics(typeid, caseids, name string, page,
 		utils.LogError("获取课程统计数据失败: " + err.Error())
 		return nil, errors.New("获取课程统计数据失败")
 	}
-	total, err := s.dao.GetCourseStatisticsCount(typeid, caseids, name)
+	all, err := s.dao.GetCourseStatisticsCount(typeid, caseids, name)
 	if err != nil {
 		utils.LogError("获取课程统计数据失败: " + err.Error())
 		return nil, errors.New("获取课程统计数据失败")
@@ -65,7 +79,21 @@ func (s *StatisticsServ) GetCourseStatistics(typeid, caseids, name string, page,
 	return map[string]interface{}{
 		"list":     list,
 		"pagesize": pageSize,
-		"pagenum":  total,
+		"pagenum":  len(all),
 		"page":     page,
 	}, nil
 }
+
+// GetCourseStatisticsExcel 课程统计导出
+func (s *StatisticsServ) GetCourseStatisticsExcel(typeid, caseids, name string) ([]statistics.CourseStatistics, error) {
+	if caseids == "" {
+		return nil, errors.New("请先选择案场信息")
+	}
+
+	all, err := s.dao.GetCourseStatisticsCount(typeid, caseids, name)
+	if err != nil {
+		utils.LogError("获取课程统计数据失败: " + err.Error())
+		return nil, errors.New("获取课程统计数据失败")
+	}
+	return all, nil
+}

service/statistics/dashboard.go

@@ -2,7 +2,6 @@ package statistics
 
 import (
 	"errors"
-	"sort"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"time"
@@ -42,11 +41,21 @@ func (s *StatisticsServ) StaDashboard(caseIDs []string) ([]interface{}, error) {
 		utils.LogError("获取支持组件失败: " + err.Error())
 		return nil, errors.New("")
 	}
+
 	compMapType := make(map[string]model.TdStatisticsComps)
+	groupComps := map[int]string{}
+	maxGroup := 0
 	for _, cmp := range comps {
 		compMapType[cmp.CompId] = cmp
+		groupComps[cmp.Group] = cmp.CompType
+
+		if maxGroup < cmp.Group {
+			maxGroup = cmp.Group
+		}
 	}
 
+	staDatas := make([]interface{}, maxGroup)
+
 	// 机构与案场
 	org := s.ctx.Get("org").(model.SysOrg)
 	// curcase := s.ctx.Get("currentCase").(model.SysUserCase)
@@ -74,11 +83,13 @@ func (s *StatisticsServ) StaDashboard(caseIDs []string) ([]interface{}, error) {
 	// 后天
 	ntd := nd.Add(24 * time.Hour)
 	// 本周
-	// tw := td.Add(time.Duration((1-wd)*24) * time.Hour)
+	tw := td.Add(time.Duration((1-wd)*24) * time.Hour)
+	// 下周
+	nw := tw.Add(7 * 24 * time.Hour)
 	// 本月
 	tm := time.Date(y, m, 1, 0, 0, 0, 0, time.Local)
 	// 下个月
-	// nm := time.Date(y, m+1, 1, 0, 0, 0, 0, time.Local)
+	nm := time.Date(y, m+1, 1, 0, 0, 0, 0, time.Local)
 
 	// 统计结果
 	res := make(map[string][]interface{})
@@ -129,7 +140,7 @@ func (s *StatisticsServ) StaDashboard(caseIDs []string) ([]interface{}, error) {
 			list := make([]map[string]interface{}, 0)
 
 			// 会员新增
-			dt, err := s.dao.GetCustomerNumber(org.OrgId, caseIDs, &td, nil)
+			dt, err := s.dao.GetCustomerNumber(org.OrgId, caseIDs, &td, &nd)
 			if err != nil {
 				utils.LogError("统计会员新增失败: " + err.Error())
 				return nil, errors.New("统计会员新增失败")
@@ -162,7 +173,7 @@ func (s *StatisticsServ) StaDashboard(caseIDs []string) ([]interface{}, error) {
 			})
 
 			// 到场人次
-			dt, err = s.dao.GetArrivedCustomerNumber(org.OrgId, caseIDs, &td, nil)
+			dt, err = s.dao.GetArrivedCustomerNumber(org.OrgId, caseIDs, &td, &nd)
 			if err != nil {
 				utils.LogError("统计到场人次失败: " + err.Error())
 				return nil, errors.New("统计到场人次失败")
@@ -175,7 +186,13 @@ func (s *StatisticsServ) StaDashboard(caseIDs []string) ([]interface{}, error) {
 			data["value"] = list
 
 		// 明日课程
-		// TODO
+		case STA_TOMORROWCOURSEORDER:
+			dt, err := s.dao.GetCourseOrderPie(org.OrgId, caseIDs, &nd, &ntd)
+			if err != nil {
+				utils.LogError("统计明日预约课程失败: " + err.Error())
+				return nil, errors.New("统计明日预约课程失败")
+			}
+			data["value"] = dt
 
 		// -------
 		// 运营
@@ -191,7 +208,7 @@ func (s *StatisticsServ) StaDashboard(caseIDs []string) ([]interface{}, error) {
 
 		// 今日到场人数
 		case STA_TODAY_ARRIVED:
-			dt, err := s.dao.GetArrivedCustomerNumber(org.OrgId, caseIDs, &td, nil)
+			dt, err := s.dao.GetArrivedCustomerNumber(org.OrgId, caseIDs, &td, &nd)
 			if err != nil {
 				utils.LogError("统计到场人次失败: " + err.Error())
 				return nil, errors.New("统计到场人次失败")
@@ -209,7 +226,7 @@ func (s *StatisticsServ) StaDashboard(caseIDs []string) ([]interface{}, error) {
 
 		// 本月卡券总数
 		case STA_MONTHCOUPONCARD:
-			dt, err := s.dao.GetCouponCardNumber(org.OrgId, caseIDs, &tm, nil)
+			dt, err := s.dao.GetCouponCardNumber(org.OrgId, caseIDs, &tm, &nm)
 			if err != nil {
 				utils.LogError("统计卡券总数失败: " + err.Error())
 				return nil, errors.New("统计卡券总数失败")
@@ -218,7 +235,7 @@ func (s *StatisticsServ) StaDashboard(caseIDs []string) ([]interface{}, error) {
 
 		// 本月客户已使用
 		case STA_MONTHUSEDCOUPONCARD:
-			dt, err := s.dao.GetUsedCouponCardNumber(org.OrgId, caseIDs, &tm, nil)
+			dt, err := s.dao.GetUsedCouponCardNumber(org.OrgId, caseIDs, &tm, &nm)
 			if err != nil {
 				utils.LogError("统计客户使用数失败: " + err.Error())
 				return nil, errors.New("统计客户使用数失败")
@@ -227,7 +244,7 @@ func (s *StatisticsServ) StaDashboard(caseIDs []string) ([]interface{}, error) {
 
 		// 本月已发放
 		case STA_MONTHUNUSEDCOUPONCARD:
-			dt, err := s.dao.GetCustomerCouponCardNumber(org.OrgId, caseIDs, &tm, nil)
+			dt, err := s.dao.GetCustomerCouponCardNumber(org.OrgId, caseIDs, &tm, &nm)
 			if err != nil {
 				utils.LogError("统计已发放卡券数失败: " + err.Error())
 				return nil, errors.New("统计已发放卡券数失败")
@@ -236,7 +253,7 @@ func (s *StatisticsServ) StaDashboard(caseIDs []string) ([]interface{}, error) {
 
 		// 本月饮品数
 		case STA_MONTHGOODS:
-			dt, err := s.dao.GetOrderGoodsNumber(org.OrgId, caseIDs, &tm, nil)
+			dt, err := s.dao.GetOrderGoodsNumber(org.OrgId, caseIDs, &tm, &nm)
 			if err != nil {
 				utils.LogError("统计商品下单失败: " + err.Error())
 				return nil, errors.New("统计商品下单失败")
@@ -245,15 +262,75 @@ func (s *StatisticsServ) StaDashboard(caseIDs []string) ([]interface{}, error) {
 
 		// 今天饮品数
 		case STA_TODAYGOODS:
-			dt, err := s.dao.GetOrderGoodsNumber(org.OrgId, caseIDs, &td, nil)
+			dt, err := s.dao.GetOrderGoodsNumber(org.OrgId, caseIDs, &td, &nd)
 			if err != nil {
 				utils.LogError("统计商品下单失败: " + err.Error())
 				return nil, errors.New("统计商品下单失败")
 			}
 			data["value"] = dt
 
+		// 本月课程预约
+		case STA_MONTHCOURSEORDER:
+			dt, err := s.dao.GetCourseOrderPie(org.OrgId, caseIDs, &tm, &nm)
+			if err != nil {
+				utils.LogError("统计本月预约课程失败: " + err.Error())
+				return nil, errors.New("统计本月预约课程失败")
+			}
+			data["value"] = dt
+
+		// 本月课程参与率
+		case STA_MONTHCOURSEPERCENT:
+			dt1, err := s.dao.GetCourseOrderCustomer(org.OrgId, caseIDs, &tm, &nm)
+			if err != nil {
+				utils.LogError("统计本月预约人数失败: " + err.Error())
+				return nil, errors.New("统计本月预约人数失败")
+			}
+
+			dt2, err := s.dao.GetUsedCourseOrderCustomer(org.OrgId, caseIDs, &tm, &nm)
+			if err != nil {
+				utils.LogError("统计本月核销人数失败: " + err.Error())
+				return nil, errors.New("统计本月核销人数失败")
+			}
+
+			dt := float64(0.0)
+			if dt2 != 0 {
+				dt = float64(dt1/dt2) * 10
+			}
+
+			data["value"] = dt
+
+		// 本周课程参与率
+		case STA_WEEKCOURSEPERCENT:
+			dt1, err := s.dao.GetCourseOrderCustomer(org.OrgId, caseIDs, &tw, &nw)
+			if err != nil {
+				utils.LogError("统计本周预约人数失败: " + err.Error())
+				return nil, errors.New("统计本周预约人数失败")
+			}
+
+			dt2, err := s.dao.GetUsedCourseOrderCustomer(org.OrgId, caseIDs, &tw, &nw)
+			if err != nil {
+				utils.LogError("统计本周核销人数失败: " + err.Error())
+				return nil, errors.New("统计本周核销人数失败")
+			}
+
+			dt := float64(0.0)
+			if dt2 != 0 {
+				dt = float64(dt1/dt2) * 10
+			}
+
+			data["value"] = dt
+
+		// 本月饮品日下单
+		case STA_GOODSDAILY:
+			dt, err := s.dao.GetGoodsWithTypeDaily(org.OrgId, caseIDs)
+			if err != nil {
+				utils.LogError("统计本月饮品下单失败: " + err.Error())
+				return nil, errors.New("统计本月饮品下单失败")
+			}
+			data["value"] = dt
+
 		default:
-			// 暂不支持的统计
+			// 其余的不在本次中返回
 			data["value"] = nil
 		}
 
@@ -266,19 +343,102 @@ func (s *StatisticsServ) StaDashboard(caseIDs []string) ([]interface{}, error) {
 		res[cmp.CompType] = typeData
 	}
 
-	// 对 comp-type 进行字典排序
-	// 因为 数据库没有设置序号字段，所以约定 comp-type 按照字典顺序进行命名
-	typeIDs := []string{}
-	for k := range res {
-		typeIDs = append(typeIDs, k)
+	for g, cmpType := range groupComps {
+		staDatas[g] = res[cmpType]
 	}
 
-	sort.Strings(typeIDs)
+	return staDatas, nil
+}
 
-	staDatas := make([]interface{}, 0)
-	for _, k := range typeIDs {
-		staDatas = append(staDatas, res[k])
+// GetStaFilterCharts 获取
+func (s *StatisticsServ) GetStaFilterCharts(caseIDs []string, staType 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("获取用户类型失败")
 	}
 
-	return staDatas, nil
+	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 配置失败")
+	}
+
+	if settings == nil {
+		return nil, nil
+	}
+	// 机构与案场
+	org := s.ctx.Get("org").(model.SysOrg)
+	// curcase := s.ctx.Get("currentCase").(model.SysUserCase)
+
+	if caseIDs == nil || len(caseIDs) > 0 {
+		allCases := s.ctx.Get("cases").([]model.SysUserCase)
+		caseIDs = []string{}
+		for _, cs := range allCases {
+			caseIDs = append(caseIDs, cs.CaseId)
+		}
+	}
+
+	res := make([]interface{}, 0)
+
+	for _, setting := range settings {
+		switch setting {
+		case STA_FILTER_CUSTOMER:
+			dt, err := s.dao.GetNewCustomerDaily(org.OrgId, caseIDs, staType)
+			if err != nil {
+				utils.LogError("统计日推荐会员失败: " + err.Error())
+				return nil, errors.New("统计日推荐会员失败")
+			}
+
+			res = append(res, dt)
+
+		case STA_FILTER_COURSE:
+			dt, err := s.dao.GetCourseDaily(org.OrgId, caseIDs, staType)
+			if err != nil {
+				utils.LogError("统计日排课量失败: " + err.Error())
+				return nil, errors.New("统计日排课量失败")
+			}
+
+			res = append(res, dt)
+
+		case STA_FILTER_COURSE_ORDER:
+			dt, err := s.dao.GetCourseOrderDaily(org.OrgId, caseIDs, staType)
+			if err != nil {
+				utils.LogError("统计日课程预约失败: " + err.Error())
+				return nil, errors.New("统计日课程预约失败")
+			}
+
+			res = append(res, dt)
+
+		case STA_FILTER_GOODS:
+			dt, err := s.dao.GetGoodsDaily(org.OrgId, caseIDs, staType)
+			if err != nil {
+				utils.LogError("统计日饮品下单失败: " + err.Error())
+				return nil, errors.New("统计日饮品下单失败")
+			}
+
+			res = append(res, dt)
+
+		case STA_FILTER_ARRIVED:
+			dt, err := s.dao.GetArrivedDaily(org.OrgId, caseIDs, staType)
+			if err != nil {
+				utils.LogError("统计日到场人次失败: " + err.Error())
+				return nil, errors.New("统计日到场人次失败")
+			}
+
+			res = append(res, dt)
+		}
+	}
+
+	return res, nil
 }

service/statistics/goods.go

@@ -2,6 +2,7 @@ package statistics
 
 import (
 	"errors"
+	"spaceofcheng/services/models/statistics"
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
 )
@@ -24,7 +25,7 @@ func (s *StatisticsServ) GetGoodsStatistics(caseids, typeid, name string, page,
 		utils.LogError("获取商品统计数据失败: " + err.Error())
 		return nil, errors.New("获取商品统计数据失败")
 	}
-	total, err := s.dao.GetGoodsStatisticsCount(caseids, typeid, name)
+	all, err := s.dao.GetGoodsStatisticsCount(caseids, typeid, name)
 	if err != nil {
 		utils.LogError("获取商品统计数据失败: " + err.Error())
 		return nil, errors.New("获取商品统计数据失败")
@@ -33,11 +34,21 @@ func (s *StatisticsServ) GetGoodsStatistics(caseids, typeid, name string, page,
 	return map[string]interface{}{
 		"list":     list,
 		"pagesize": pageSize,
-		"pagenum":  total,
+		"pagenum":  len(all),
 		"page":     page,
 	}, nil
 }
 
+// GetGoodsStatisticsExcel 获取商品统计信息导出
+func (s *StatisticsServ) GetGoodsStatisticsExcel(caseids, typeid, name string) ([]statistics.GoodsStatistics, error) {
+	all, err := s.dao.GetGoodsStatisticsCount(caseids, typeid, name)
+	if err != nil {
+		utils.LogError("获取商品统计数据失败: " + err.Error())
+		return nil, errors.New("获取商品统计数据失败")
+	}
+	return all, nil
+}
+
 // GetGoodsOrdersStatistics 获取商品订单统计信息
 func (s *StatisticsServ) GetGoodsOrdersStatistics(status, usertype, caseids, begindate, enddate string, page, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
@@ -56,7 +67,7 @@ func (s *StatisticsServ) GetGoodsOrdersStatistics(status, usertype, caseids, beg
 		utils.LogError("获取商品订单统计数据失败: " + err.Error())
 		return nil, errors.New("获取商品订单统计数据失败")
 	}
-	total, err := s.dao.GetGoodsOrderStatisticsCount(status, usertype, caseids, begindate, enddate)
+	all, err := s.dao.GetGoodsOrderStatisticsCount(status, usertype, caseids, begindate, enddate)
 	if err != nil {
 		utils.LogError("获取商品订单统计数据失败: " + err.Error())
 		return nil, errors.New("获取商品订单统计数据失败")
@@ -65,7 +76,22 @@ func (s *StatisticsServ) GetGoodsOrdersStatistics(status, usertype, caseids, beg
 	return map[string]interface{}{
 		"list":     list,
 		"pagesize": pageSize,
-		"pagenum":  total,
+		"pagenum":  len(all),
 		"page":     page,
 	}, nil
 }
+
+// GetGoodsOrdersStatisticsExcel 商品订单导出
+func (s *StatisticsServ) GetGoodsOrdersStatisticsExcel(status, usertype, caseids, begindate, enddate string) ([]statistics.GoodsOrdersStatistics, error) {
+	if caseids == "" {
+		return nil, errors.New("请先选择案场信息")
+	}
+
+	all, err := s.dao.GetGoodsOrderStatisticsCount(status, usertype, caseids, begindate, enddate)
+	if err != nil {
+		utils.LogError("获取商品订单统计数据失败: " + err.Error())
+		return nil, errors.New("获取商品订单统计数据失败")
+	}
+
+	return all, nil
+}

service/statistics/setting.go

@@ -42,4 +42,27 @@ const (
 
 	// 本月客户已使用
 	STA_MONTHUSEDCOUPONCARD = "month_unused_coupon_card"
+
+	// 本月课程预约
+	STA_MONTHCOURSEORDER = "month_course_order"
+
+	// 本月课程参与率
+	STA_MONTHCOURSEPERCENT = "month_course_percent"
+
+	// 本周课程参与率
+	STA_WEEKCOURSEPERCENT = "week_course_percent"
+
+	// 日下单数据
+	STA_GOODSDAILY = "goods_daily"
+
+	// 推荐会员
+	STA_FILTER_CUSTOMER = "sta_customer"
+	// 排课数
+	STA_FILTER_COURSE = "sta_course"
+	// 课程预约
+	STA_FILTER_COURSE_ORDER = "sta_course_order"
+	// 饮品下单
+	STA_FILTER_GOODS = "sta_goods"
+	// 到场人次
+	STA_FILTER_ARRIVED = "sta_arrived"
 )

service/sys.go

@@ -348,12 +348,16 @@ func (s *SysServ) wechartSignIn(gctx *context.Context, code string) (*utils.Wech
 }
 
 func (s *SysServ) getToken(gctx *context.Context) (*utils.JWTToken, error) {
-	tokenRaw := gctx.Input.Header(utils.TokenHeader)
-	if tokenRaw == "" {
-		return new(utils.JWTToken), nil
+	tokenEnStr := gctx.Input.Query("token")
+	if tokenEnStr == "" {
+		tokenRaw := gctx.Input.Header(utils.TokenHeader)
+		if tokenRaw == "" {
+			return new(utils.JWTToken), nil
+		}
+
+		tokenEnStr = strings.Trim(strings.TrimLeft(tokenRaw, utils.TokenSchema), " ")
 	}
 
-	tokenEnStr := strings.Trim(strings.TrimLeft(tokenRaw, utils.TokenSchema), " ")
 	s.ctx.Set("token", tokenEnStr)
 
 	token, err := utils.PareseToken(tokenEnStr)