Merge branch '2.1.1' into dev

bootstrap/bootstrap.go

@@ -0,0 +1,29 @@
+package bootstrap
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/routers"
+	"spaceofcheng/services/service/events"
+	"spaceofcheng/services/utils"
+)
+
+// SystemInit 系统初始化
+func SystemInit() {
+	// 数据库连接
+	models.InitDB()
+
+	// 系统日志
+	utils.LogInit()
+
+	// 微信系统
+	utils.WechatInit()
+
+	// 消息系统
+	utils.MessageInit()
+
+	// 事件系统
+	events.EventInit()
+
+	// 路由系统
+	routers.RouteInit()
+}

conf/app.conf

@@ -5,13 +5,15 @@ autorender = false
 copyrequestbody = true
 EnableDocs = true
 excelpath = ./
-clienturl = http://dev.ycjcjy.com/c-v2
+clienturl = http://dev.ycjcjy.com/
 
 postwechatInfo = http://testapi.chioy.com.cn/api/network/postwechatInfo
 qrcodePrefix = bodycheck_
 followText = 您正在使用悦琦设备进行体检~
 resultURL = http://spaceofcheng.ycjcjy.com/wechat/bodyCheck.html
 
+defaultShareUserID = 1
+
 [cros]
 allowMode = dev
 allowCredentials = true

conf/db.conf

@@ -5,8 +5,9 @@ db_type      = mysql
 con_protocol = tcp
 
 ; 数据库地址，可以使用IP
-db_addr      = 192.168.0.122
-# db_addr      = localhost
+db_addr      = 47.101.36.130
+# db_addr        = 192.168.0.122
+; db_addr = localhost
 # db_addr      = rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com
 
 ; 端口

conf/wechat.conf

@@ -1 +1,6 @@
 messageTplID = EB1Bto8JmW-vC-A0NTe8NtxgMFm6s86l3g2Bc-1OP6U
+
+# 中奖ID
+luckdrawMessageTplID = 8t7WQTrx-D566ohRD6RgdMkiu8DUiAxG_Jajg33YHVI
+luckdrawNoticeURL = http://dev.ycjcjy.com/game/luckdraw/#/lotteryList?tab=1
+flashBuyNoticeURL = http://dev.ycjcjy.com/game/luckdraw/#/lotteryList?tab=2

controllers/base.go

@@ -97,27 +97,6 @@ func (c *BaseController) ResponseData(data interface{}, msg interface{}, code in
 	c.StopRun()
 }
 
-// Options 解决跨域先发送 options
-func (c *BaseController) Options() {
-	c.ResponseJSON("")
-}
-
-// crosPolicy 跨域策略
-func (c *BaseController) crosPolicy() {
-	runMode := beego.AppConfig.String("runmode")
-	allowMode := beego.AppConfig.String("cros::allowMode")
-	allowMethods := beego.AppConfig.String("cros::allowMethods")
-	allowOrigin := beego.AppConfig.String("cros::allowOrigin")
-	allowCredentials := beego.AppConfig.String("cros::allowCredentials")
-
-	if runMode == allowMode {
-		c.Ctx.Output.Header("Access-Control-Allow-Origin", allowOrigin)
-		c.Ctx.Output.Header("Access-Control-Allow-Methods", allowMethods)
-		c.Ctx.Output.Header("Access-Control-Allow-Credentials", allowCredentials)
-		c.Ctx.Output.Header("Access-Control-Allow-Headers", "X-Token,Authorization")
-	}
-}
-
 // initAppController 执行当前路由请求对应的 Controller 初始化
 func (c *BaseController) initController() {
 	if ctrl, ok := c.AppController.(ControllerInterface); ok {

controllers/bodycheck/bodycheck.go

@@ -14,9 +14,9 @@ import (
 
 // 二维码不多次获取, 只获取一次即可
 // 临时的解决方案是放到全局单例对象中
-var qrCodes map[string]string
+var qrCodes = make(map[string]string)
 
-var mtx *sync.Mutex
+var mtx = new(sync.Mutex)
 
 // BodyCheckController 商品
 type BodyCheckController struct {
@@ -105,8 +105,3 @@ func (c *BodyCheckController) PostCheckResult() {
 		"Message": "",
 	})
 }
-
-func init() {
-	qrCodes = make(map[string]string)
-	mtx = new(sync.Mutex)
-}

controllers/card/card.go

@@ -38,7 +38,11 @@ func (c *CardController) ListByCase() {
 		pagesize = 10
 	}
 
-	list, total, err := c.serv.GetCardList(caseid, page, pagesize)
+	sendtype := c.GetString("sendtype")
+	usetype := c.GetString("usetype")
+	usedid := c.GetString("usedid")
+
+	list, total, err := c.serv.GetCardList(caseid, sendtype, usetype, usedid, page, pagesize)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -266,3 +270,12 @@ func (c *CardController) GetCustomerCardByCustomerAndSale() {
 	}
 	c.ResponseJSON(cards)
 }
+
+func (c *CardController) GetSysCardList() {
+	caseid := c.GetString(":caseId")
+	cards, err := c.serv.GetSysCardList(caseid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(cards)
+}

controllers/config.go

@@ -3,44 +3,48 @@ package controllers
 import (
 	"spaceofcheng/services/utils"
 
-	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/config"
 )
 
 // 配置文件列表
 const (
+	AppConf    = "app"
 	AliYunConf = "aliyun"
 	WeChatConf = "wechat"
 	SMSConf    = "sms"
 )
 
 func (c *BaseController) initConfig() {
-	c.RunMode = beego.AppConfig.String("runmode")
+	// c.RunMode = beego.AppConfig.String("runmode")
 
 	if c.Configer == nil {
 		c.Configer = make(map[string]config.Configer)
 	}
 
+	// 系统
+	appConf, _ := utils.GetConfiger("conf/app.conf")
+	if appConf != nil {
+		c.Configer[AppConf] = appConf
+	}
+
+	c.RunMode = appConf.String("runmode")
+
 	// 阿里云
-	aliConf := c.getConfig("conf/aliyun.conf")
+	aliConf, _ := utils.GetConfiger("conf/aliyun.conf")
 	if aliConf != nil {
 		c.Configer[AliYunConf] = aliConf
 	}
 
 	// 短信
-	smsConf := c.getConfig("conf/sms.conf")
+	smsConf, _ := utils.GetConfiger("conf/sms.conf")
 	if smsConf != nil {
 		c.Configer[SMSConf] = smsConf
 	}
 	utils.ResetSMSEngine(smsConf)
-}
 
-func (c *BaseController) getConfig(confPath string) config.Configer {
-	aliConf, err := config.NewConfig("ini", confPath)
-	if err != nil {
-		utils.LogError("读取配置文件失败: " + err.Error())
-		return nil
+	// 微信
+	wechatConf, _ := utils.GetConfiger("conf/wechat.conf")
+	if wechatConf != nil {
+		c.Configer[WeChatConf] = wechatConf
 	}
-
-	return aliConf
 }

controllers/coupon/coupon.go

@@ -39,7 +39,11 @@ func (c *CouponController) ListByCase() {
 		pagesize = 10
 	}
 
-	list, total, err := c.serv.GetCouponList(caseID, page, pagesize)
+	sendtype := c.GetString("sendtype")
+	usetype := c.GetString("usetype")
+	usedid := c.GetString("usedid")
+
+	list, total, err := c.serv.GetCouponList(caseID, sendtype, usetype, usedid, page, pagesize)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -277,3 +281,12 @@ func (c *CouponController) GetCustomerCouponByCustomerAndSale() {
 	}
 	c.ResponseJSON(Coupons)
 }
+
+func (c *CouponController) GetSysCouponByCase() {
+	caseId := c.GetString(":caseId")
+	coupon, err := c.serv.GetSysCouponByCase(caseId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(coupon)
+}

controllers/course/order.go

@@ -8,6 +8,7 @@ import (
 	"spaceofcheng/services/utils"
 )
 
+// 下单
 func (c *CourseController) PostOrder() {
 	// 订单主信息
 	info := c.GetString("info")
@@ -15,10 +16,6 @@ func (c *CourseController) PostOrder() {
 		c.ResponseError(errors.New("无有效订单信息"))
 	}
 
-	// 订单优惠券
-	customercouponid := c.GetString("customercouponid")
-
-	//
 	var orderInfo model.TaCourseOrders
 	//	var orderCoupon []model.TaCourseOrdersCoupon
 
@@ -39,10 +36,27 @@ func (c *CourseController) PostOrder() {
 			http.StatusNotAcceptable,
 		)
 	}
+	newOrders, err := c.serv.PreOrders(&orderInfo)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(newOrders)
+}
+
+// ConfirmOrders 确认订单
+func (c *CourseController) ConfirmOrders() {
+
+	// 订单优惠券
+	customercouponid := c.GetString("customercouponid")
+
+	// 订单id
+	ordersid := c.GetString(":ordersid")
 
-	if err := c.serv.Orders(&orderInfo, customercouponid); err != nil {
+	err := c.serv.ConfirmOrders(ordersid, customercouponid)
+	if err != nil {
 		c.ResponseError(err)
 	}
 
-	c.ResponseJSON("ok")
+	c.ResponseJSON("下单成功！")
 }

controllers/cros.go

@@ -0,0 +1,25 @@
+package controllers
+
+// Options 解决跨域先发送 options
+func (c *BaseController) Options() {
+	c.ResponseJSON("")
+}
+
+// crosPolicy 跨域策略
+func (c *BaseController) crosPolicy() {
+	appConf, ok := c.Configer[AppConf]
+	if ok {
+		runMode := appConf.String("runmode")
+		allowMode := appConf.String("cros::allowMode")
+		allowMethods := appConf.String("cros::allowMethods")
+		allowOrigin := appConf.String("cros::allowOrigin")
+		allowCredentials := appConf.String("cros::allowCredentials")
+
+		if runMode == allowMode {
+			c.Ctx.Output.Header("Access-Control-Allow-Origin", allowOrigin)
+			c.Ctx.Output.Header("Access-Control-Allow-Methods", allowMethods)
+			c.Ctx.Output.Header("Access-Control-Allow-Credentials", allowCredentials)
+			c.Ctx.Output.Header("Access-Control-Allow-Headers", "X-Token,Authorization")
+		}
+	}
+}

controllers/customer/customer.go

@@ -110,8 +110,7 @@ func (c *CustomerController) SignIn() {
 func (c *CustomerController) SignUp() {
 	phone := c.GetString("phone")
 	captcha := c.GetString("captcha")
-	csID := c.GetString("case")
-	arID := c.GetString("sales")
+	recommendCode := c.GetString("recommendCode")
 
 	if phone == "" || captcha == "" {
 		c.ResponseError(errors.New("请填写完整注册信息"))
@@ -125,7 +124,7 @@ func (c *CustomerController) SignUp() {
 
 	userMapping := c.Context.Get("userMap").(model.TaUserMapping)
 
-	_, err := c.serv.BindWechatCust(&userMapping, phone, csID, arID)
+	_, err := c.serv.BindWechatCust(&userMapping, phone, recommendCode)
 	if err != nil {
 		c.ResponseError(err)
 	}

controllers/customerremark/customerremark.go

@@ -0,0 +1,75 @@
+package customerremark
+
+import (
+	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service/customerremark"
+)
+
+// CaseController 信息
+type CustomerRemarkController struct {
+	dao *customerremark.CustomerRemarkServ
+	controllers.BaseController
+}
+
+// Constructor 初始化 Controller
+// @Title Constructor
+// @Description 初始化 Controller, 系统自动调用
+func (c *CustomerRemarkController) Constructor() {
+	c.dao = customerremark.NewCustomerRemarkServ(c.Context)
+}
+
+func (c *CustomerRemarkController) GetCustomerRemarkList() {
+	salesId := c.GetString(":salesId")
+	customerId := c.GetString(":customerId")
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	list, err := c.dao.GetCustomerRemarkList(salesId, customerId, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+func (c *CustomerRemarkController) GetCustomerReceiveRecord() {
+	salesId := c.GetString(":salesId")
+	customerId := c.GetString(":customerId")
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	list, err := c.dao.GetCustomerReceiveRecord(salesId, customerId, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+func (c *CustomerRemarkController) AddRemark() {
+	remark := model.TaSaleCustomerRemark{}
+	if err := c.ParseForm(&remark); err != nil {
+		c.ResponseError(err)
+	}
+	newRemark, err := c.dao.AddRemark(remark)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newRemark)
+}
+
+func (c *CustomerRemarkController) IsExist() {
+	recommendCode := c.GetString(":recommendCode")
+	num, err := c.dao.IsExist(recommendCode)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(num)
+}
+
+func (c *CustomerRemarkController) SearchCustomer() {
+	salesId := c.GetString(":salesId")
+	customerInfo := c.GetString(":customerInfo")
+	customer, err := c.dao.SearchCustomer(customerInfo, salesId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(customer)
+}

controllers/file.go

@@ -72,3 +72,52 @@ func (c *BaseController) SaveToExcel(fn string, excel *utils.TinyXLSXEngine) {
 	c.destroyContext(true)
 	c.StopRun()
 }
+
+// UploadBase64Image Upload base64-image to ali-oss
+// @Title Upload image to ali-oss
+// @Description 上传base64图片到阿里云
+// @Param   UpImgStr     form    string  true        "图片控件name"
+// @Success 200 { Url } 图片URL
+// @Failure >300 error message
+func (c *BaseController) UploadBase64Image() {
+	base64Str, err := url.QueryUnescape(c.GetString("base64str"))
+	if err != nil {
+		c.ResponseError(utils.LogError("上传 Base64 图片失败", err))
+	}
+
+	imgURL, err := c.uploadStringToAliOSS(base64Str)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	resp := map[string]interface{}{
+		"url": imgURL,
+	}
+
+	c.ResponseJSON(resp)
+}
+
+// uploadStringToAliOSS 上传文件到阿里云
+func (c *BaseController) uploadStringToAliOSS(fStr string) (string, error) {
+	aliConf, ok := c.Configer[AliYunConf]
+	if !ok {
+		return "", errors.New("没有找到阿里云相关配置")
+	}
+
+	endpoint := aliConf.String("oss::Endpoint")
+	accessKeyID := aliConf.String("oss::AccessKeyId")
+	accessKeySecret := aliConf.String("oss::AccessKeySecret")
+	bucket := aliConf.String("oss::Bucket")
+
+	aliCli, err := utils.GetOssClient(endpoint, accessKeyID, accessKeySecret)
+	if err != nil {
+		return "", utils.LogError("配置阿里云客户端失败", err)
+	}
+
+	fileURL, err := utils.UploadStringToBucket(aliCli, bucket, fStr)
+	if err != nil {
+		return "", utils.LogError("上传文件到阿里云失败", err)
+	}
+
+	return fileURL, nil
+}

controllers/flashbuy/flashbuy.go

@@ -0,0 +1,217 @@
+package flashbuy
+
+import (
+	"encoding/json"
+	"errors"
+	"net/http"
+	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service/flashbuy"
+	"spaceofcheng/services/utils"
+)
+
+// CaseController 信息
+type FlashBuyController struct {
+	dao *flashbuy.FlashBuyServ
+	controllers.BaseController
+}
+
+// Constructor 初始化 Controller
+// @Title Constructor
+// @Description 初始化 Controller, 系统自动调用
+func (c *FlashBuyController) Constructor() {
+	c.dao = flashbuy.NewFlashBuyServ(c.Context)
+}
+func (c *FlashBuyController) GetFlashBuyList() {
+	caseIDs := c.GetString("caseid")
+	if caseIDs == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseIDs = c.GetCaseIDs(cases)
+	}
+	flashBuyName := c.GetString("flashbuyname")
+	flashBuyStatus := c.GetString("flashbuystatus")
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	list, err := c.dao.GetFlashBuyList(caseIDs, flashBuyName, flashBuyStatus, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+func (c *FlashBuyController) GetCustomerFlashBuyByCustomerId() {
+	userRaw := c.Context.Get("customer")
+	if userRaw == nil {
+		c.ResponseError(errors.New("系统内部错误"), http.StatusInternalServerError)
+	}
+
+	user := userRaw.(model.TaCustomer)
+	customerId := user.CustomerId
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	list, err := c.dao.GetCustomerFlashBuyByCustomerId(customerId, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+func (c *FlashBuyController) GetCustomerFlashBuyList() {
+	flashBuyId := c.GetString(":flashBuyId")
+	phone := c.GetString("phone")
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	list, err := c.dao.GetCustomerFlashBuyById(flashBuyId, phone, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+
+}
+
+// GetFlashBuyById 获取抢购详情
+func (c *FlashBuyController) GetFlashBuyById() {
+	flashBuyId := c.GetString(":flashBuyId")
+	flashBuy, err := c.dao.GetFlashBuyById(flashBuyId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(flashBuy)
+}
+
+// GetWechatFlashBuyById
+func (c *FlashBuyController) GetWechatFlashBuyById() {
+	flashBuyId := c.GetString(":flashBuyId")
+	cust := c.Context.Get("customer").(model.TaCustomer)
+	flashBuy, err := c.dao.GetFlashBuyById(flashBuyId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	userinfo, err := c.dao.GetFlashByUser(flashBuyId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	flashCustomer, err := c.dao.IsFlashBuyCustomer(cust.CustomerId, flashBuyId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(map[string]interface{}{
+		"flashBuy":      flashBuy,
+		"userInfo":      userinfo,
+		"flashCustomer": flashCustomer,
+	})
+}
+
+func (c *FlashBuyController) GetCustomerFlashBuyId() {
+	flashBuyId := c.GetString(":customerFlashBuyId")
+	flashBuy, err := c.dao.GetCustomerFlashBuyId(flashBuyId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(flashBuy)
+}
+
+func (c *FlashBuyController) SaveFlashBuy() {
+	jsnStr := c.GetString("info")
+	if jsnStr == "" {
+		c.ResponseError(errors.New("未接收到保存内容"))
+	}
+	info := model.TaFlashBuy{}
+	if err := json.Unmarshal([]byte(jsnStr), &info); err != nil {
+		utils.LogError("抢购数据转换失败: " + err.Error())
+		c.ResponseError(err)
+	}
+	newFlashBuy, err := c.dao.SaveFlashBuy(info)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newFlashBuy)
+}
+
+func (c *FlashBuyController) DeleteFlashBuy() {
+	flashBuyId := c.GetString(":flashBuyId")
+	err := c.dao.DeleteFlashBuy(flashBuyId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("删除成功")
+}
+
+func (c *FlashBuyController) UpdateFlashBuy() {
+	flashBuyId := c.GetString(":flashBuyId")
+	flashBuyStatus := c.GetString(":flashBuyStatus")
+	err := c.dao.UpdateFlashBuy(flashBuyId, flashBuyStatus)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("修改成功")
+}
+
+func (c *FlashBuyController) VerifyCustomerFlashBuyList() {
+	qrcode := c.GetString(":qrcode")
+	caseids := c.GetString(":caseId")
+	customerFlashBuy, err := c.dao.VerifyCustomerFlashBuyList(qrcode, caseids)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(customerFlashBuy)
+}
+func (c *FlashBuyController) Verify() {
+	customerFlashBuyId := c.GetString(":customerFlashBuyId")
+	err := c.dao.Verify(customerFlashBuyId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("核销成功")
+}
+
+// FlashBuy 抢购
+func (c *FlashBuyController) FlashBuy() {
+	id := c.GetString(":id")
+
+	c.Context.Set("clienturl", c.Configer[controllers.WeChatConf].String("flashBuyNoticeURL"))
+	c.Context.Set("tplid", c.Configer[controllers.WeChatConf].String("luckdrawMessageTplID"))
+
+	err := c.dao.FlashBuy(id)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("恭喜您！抢购成功！")
+}
+
+func (c *FlashBuyController) GetFlashModelList() {
+	model, err := c.dao.GetFlashModelList()
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(model)
+}
+
+func (c *FlashBuyController) AddNewFlashBuyCustomer() {
+	cust := c.Context.Get("customer").(model.TaCustomer)
+	flashBuyId := c.GetString(":flashBuyId")
+	err := c.dao.AddNewFlashBuyCustomer(cust, flashBuyId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("添加成功")
+}
+
+func (c *FlashBuyController) UpdateFlashBuyCustomer() {
+	cust := c.Context.Get("customer").(model.TaCustomer)
+	flashBuyId := c.GetString(":flashBuyId")
+	err := c.dao.UpdateFlashBuyCustomer(cust.CustomerId, flashBuyId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("修改成功")
+}
+
+func (c *FlashBuyController) IsNewCustomer() {
+	cust := c.Context.Get("customer").(model.TaCustomer)
+	if cust.Phone == "" {
+		c.ResponseError(errors.New("不是新用户"))
+	}
+	c.ResponseJSON("是新用户")
+}

controllers/goods/order.go

@@ -12,7 +12,7 @@ import (
 	"time"
 )
 
-var mtx *sync.Mutex
+var mtx = new(sync.Mutex)
 
 // GetOrderList 获取商品订单
 // 管理端 - 统计查询
@@ -107,12 +107,6 @@ func (c *GoodsController) PostOrder() {
 		c.ResponseError(errors.New("无有效订单详情信息"))
 	}
 
-	// 订单优惠券
-	customercouponid := c.GetString("customercouponid")
-	if customercouponid == "undefined" {
-		customercouponid = ""
-	}
-
 	//
 	var orderInfo model.TaGoodsOrders
 	var orderDetail []model.TaGoodsOrdersDetail
@@ -140,11 +134,31 @@ func (c *GoodsController) PostOrder() {
 		)
 	}
 
-	if err := c.serv.Orders(&orderInfo, orderDetail, customercouponid, innerUser); err != nil {
+	newOrders, err := c.serv.PreOrders(&orderInfo, orderDetail, innerUser)
+	if err != nil {
 		c.ResponseError(err)
 	}
 
-	c.ResponseJSON("ok")
+	c.ResponseJSON(newOrders)
+}
+
+// ConfirmOrders 确认下单
+func (c *GoodsController) ConfirmOrders() {
+	ordersID := c.GetString(":ordersid")
+
+	// 备注
+	remark := c.GetString("remark")
+
+	// 订单优惠券
+	customercouponid := c.GetString("customercouponid")
+	if customercouponid == "undefined" {
+		customercouponid = ""
+	}
+	if err := c.serv.ConfirmOrder(ordersID, customercouponid, remark); err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON("下单成功")
 }
 
 // GetOrdersByRecord 根据月记录导出订单信息
@@ -298,7 +312,3 @@ func (c *GoodsController) UpdateOrdersIntimidate() {
 	}
 	c.ResponseJSON("操作成功！")
 }
-
-func init() {
-	mtx = new(sync.Mutex)
-}

controllers/luckdraw/luckdraw.go

@@ -1,13 +1,17 @@
 package luckdraw
 
 import (
+	"encoding/json"
 	"errors"
 	"net/http"
 	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/customer"
+	luckdrawModel "spaceofcheng/services/models/luckdraw"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/luckdraw"
 	"spaceofcheng/services/utils"
+	"strconv"
 )
 
 // LuckdrawController 应用
@@ -25,6 +29,117 @@ func (c *LuckDrawController) Constructor() {
 	c.custDAO = customer.NewCustomerDAO(c.Context)
 }
 
+// GetLuckDrawTpl 获取抽奖模板
+func (c *LuckDrawController) GetLuckDrawTpl() {
+	tpls, err := c.serv.GetLuckDrawTpl()
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(tpls)
+}
+
+// GetLuckDrawList 获取抽奖列表
+func (c *LuckDrawController) GetLuckDrawList() {
+	caseids := c.GetString("caseid")
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	name := c.GetString("name")
+	status := c.GetString("status")
+	list, err := c.serv.GetLuckDrawList(caseids, name, status, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+// GetLuckDrawRecordList 获取抽奖记录列表
+func (c *LuckDrawController) GetLuckDrawRecordList() {
+	luckdrawid := c.GetString(":luckdrawid")
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	tel := c.GetString("tel")
+	list, err := c.serv.GetLuckDrawRecordList(luckdrawid, tel, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+// GetLuckDrawShareList 获取抽奖分享记录列表
+func (c *LuckDrawController) GetLuckDrawShareList() {
+	luckdrawid := c.GetString(":luckdrawid")
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	tel := c.GetString("tel")
+	list, err := c.serv.GetLuckDrawShareList(luckdrawid, tel, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+// GetLuckDrawByID 根据id获取抽奖信息
+func (c *LuckDrawController) GetLuckDrawByID() {
+	id := c.GetString(":luckdrawid")
+	luckdraw, err := c.serv.GetLuckDrawInfoByID(id)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(luckdraw)
+}
+
+// SaveLuckDraw 保存抽奖信息
+func (c *LuckDrawController) SaveLuckDraw() {
+	jsnStr := c.GetString("info")
+	if jsnStr == "" {
+		c.ResponseError(errors.New("未接收到保存内容"))
+	}
+	info := luckdrawModel.LuckDrawInfo{}
+	if err := json.Unmarshal([]byte(jsnStr), &info); err != nil {
+		utils.LogError("抽奖数据转换失败: " + err.Error())
+		c.ResponseError(err)
+	}
+	newinfo, err := c.serv.SaveLuckDraw(&info)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newinfo)
+}
+
+// DelLuckDraw 删除抽奖信息
+func (c *LuckDrawController) DelLuckDraw() {
+	luckdrawid := c.GetString(":luckdrawid")
+	err := c.serv.DelLuckDraw(luckdrawid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("操作成功！")
+}
+
+// OpenLuckDraw 抽奖启用
+func (c *LuckDrawController) OpenLuckDraw() {
+	luckdrawid := c.GetString(":luckdrawid")
+	err := c.serv.OpenLuckDraw(luckdrawid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("操作成功！")
+}
+
+// StopLuckDraw 抽奖启用
+func (c *LuckDrawController) StopLuckDraw() {
+	luckdrawid := c.GetString(":luckdrawid")
+	err := c.serv.StopLuckDraw(luckdrawid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("操作成功！")
+}
+
 // GetUserByCode 根据code获取用户信息
 func (c *LuckDrawController) GetUserByCode() {
 	userRaw := c.Context.Get("customer")
@@ -34,7 +149,7 @@ func (c *LuckDrawController) GetUserByCode() {
 
 	user := userRaw.(model.TaCustomer)
 	luckdrawid := c.GetString(":id")
-	record, err := c.serv.GetUserLuckDrawByLuckDraw(user.CustomerId, luckdrawid)
+	record, set, err := c.serv.GetUserLuckDrawByLuckDraw(user, luckdrawid)
 	if err != nil {
 		utils.LogError("获取用户抽奖信息失败: " + err.Error())
 		c.ResponseError(errors.New("获取用户抽奖信息失败"))
@@ -52,6 +167,7 @@ func (c *LuckDrawController) GetUserByCode() {
 		"user":   user,
 		"record": record,
 		"detail": detail,
+		"set":    set,
 	})
 }
 
@@ -76,6 +192,9 @@ func (c *LuckDrawController) LuckDraw() {
 
 	user := userRaw.(model.TaCustomer)
 
+	c.Context.Set("clienturl", c.Configer[controllers.WeChatConf].String("luckdrawNoticeURL"))
+	c.Context.Set("tplid", c.Configer[controllers.WeChatConf].String("luckdrawMessageTplID"))
+
 	prize, detail, err := c.serv.LuckDraw(id, &user)
 	if err != nil {
 		c.ResponseError(err)
@@ -249,5 +368,19 @@ func (c *LuckDrawController) SaveShareRecord() {
 		)
 	}
 
+	fromIsNew := c.GetString("isnew")
+
+	// 分享可以增加抽奖次数
+	if luckdraw.ShareType == models.SHARETYPE_NEWUSER && fromIsNew == strconv.Itoa(models.BOOL_TRUE) {
+		if err := c.serv.UpdateShareNum(luckdraw, fromID); err != nil {
+			utils.LogError("更新抽奖次数失败: " + err.Error())
+			c.ResponseData(
+				errIgnore,
+				"保存分享记录失败",
+				http.StatusBadRequest,
+			)
+		}
+	}
+
 	c.ResponseJSON("ok")
 }

controllers/marketing/marketing.go

@@ -23,8 +23,11 @@ func (c *MarketingController) Constructor() {
 func (c *MarketingController) GetMarketingList() {
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pageSize")
-	cases := c.Context.Get("cases").([]model.SysUserCase)
-	caseIDs := c.GetCaseIDs(cases)
+	caseIDs := c.GetString("caseid")
+	if caseIDs == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseIDs = c.GetCaseIDs(cases)
+	}
 	marketings, err := c.serv.GetMarketingList(caseIDs, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
@@ -43,10 +46,12 @@ func (c *MarketingController) SaveMarketing() {
 	activityType := c.GetString("activityType")
 	activeType := c.GetString("activeType")
 	resourceDesc := c.GetString("resourceDesc") // 活动描述
+	caseId := c.GetString("CaseId")
 
 	// 赋值
 	marketing.ActivityName = activityName
 	marketing.ActivityType = activityType
+	marketing.CaseId = caseId
 
 	newInfo, _, err := c.serv.SaveMarketing(marketing, activeType, resourceDesc)
 	if err != nil {
@@ -116,3 +121,13 @@ func (c *MarketingController) SetMarketingDisable() {
 	}
 	c.ResponseJSON("操作成功!")
 }
+
+func (c *MarketingController) GetUserCases() {
+	cases := c.Context.Get("cases").([]model.SysUserCase)
+	caseIDs := c.GetCaseIDs(cases)
+	sysCase, err := c.serv.GetUserCases(caseIDs)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(sysCase)
+}

controllers/statistics/cardcoupon.go

@@ -150,6 +150,7 @@ func (c *StatisticsController) CardCouponUsedStatisticsExcel() {
 		"获取方式",
 		"微信昵称",
 		"手机号",
+		"销售",
 		"有效期",
 		"获取时间",
 		"使用时间",
@@ -163,7 +164,7 @@ func (c *StatisticsController) CardCouponUsedStatisticsExcel() {
 		case "event":
 			receivetype = "系统"
 			break
-		case "case":
+		case "sales":
 			receivetype = "案场"
 			break
 		case "channel":
@@ -197,6 +198,7 @@ func (c *StatisticsController) CardCouponUsedStatisticsExcel() {
 			receivetype,
 			item.CustomerName,
 			item.Phone,
+			item.SalesName,
 			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"),

controllers/user/user.go

@@ -314,3 +314,12 @@ func (c *UserController) GetCaseUserByID() {
 	}
 	c.ResponseJSON(userdetail)
 }
+
+func (c *UserController) GetMyRecommendCode() {
+	user := c.Context.Get("user").(model.SysUser)
+	if user.UserId == "" {
+		utils.LogError("获取人员推荐码失败")
+		c.ResponseError(errors.New("获取人员推荐码失败"))
+	}
+	c.ResponseJSON(user.RecommendCode)
+}

controllers/verify/verify.go

@@ -71,7 +71,7 @@ func (c *VerifyController) VerifyCourse() {
 			c.ResponseError(err)
 		}
 		if customerCard.VerifyStatus == models.VERIFY_USEABLE {
-			if customerCard.EndDate.After(time.Now()) {
+			if customerCard.EndDate.Before(time.Now()) {
 				customerCard.VerifyStatus = models.VERIFY_LATE
 				err := c.dao.UpdateCustomerCard(customerCard)
 				if err != nil {

controllers/vipcard/vipcard.go

@@ -6,8 +6,8 @@ import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/vipcard"
-	"time"
 	"spaceofcheng/services/utils"
+	"time"
 )
 
 // CaseController 信息
@@ -69,6 +69,10 @@ func (c *VipcardController) UserCharge() {
 		c.ResponseError(err)
 	}
 
+	if vipChild.Status != models.STATUS_READY {
+		c.ResponseError(errors.New("Vip卡已被激活！"))
+	}
+
 	customer, err := c.dao.FindCustomerByTel(tel)
 	if err != nil {
 		c.ResponseError(err)
@@ -91,10 +95,15 @@ func (c *VipcardController) UserCharge() {
 	if err != nil {
 		c.ResponseError(err)
 	}
-	err = c.dao.CustomerCharge(vipChild, createUser)
+	// 插入客户VIP卡
+	err = c.dao.SaveCustomerVip(vipChild, createUser)
 	if err != nil {
 		c.ResponseError(err)
 	}
+	// err = c.dao.CustomerCharge(vipChild, createUser)
+	// if err != nil {
+	// 	c.ResponseError(err)
+	// }
 	c.ResponseJSON("激活成功")
 
 }
@@ -109,9 +118,8 @@ func (c *VipcardController) GetVipByCode() {
 	c.ResponseJSON(vipChild)
 }
 
-
 // GetVipListExcel 导出VIP 列表
-func (c *VipcardController) GetVipListExcel(){
+func (c *VipcardController) GetVipListExcel() {
 
 	caseids := c.GetString("caseid")
 	if caseids == "" {
@@ -154,7 +162,7 @@ func (c *VipcardController) GetVipListExcel(){
 		statusToString := ""
 		if item.Status == 1 {
 			statusToString = "已激活"
-		}else{
+		} else {
 			statusToString = "未激活"
 		}
 
@@ -173,6 +181,11 @@ func (c *VipcardController) GetVipListExcel(){
 
 }
 
-
-
-
+// GetCustomerVips 获取客户vip卡
+func (c *VipcardController) GetCustomerVips() {
+	vips, err := c.dao.GetCustomerVips()
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(vips)
+}

main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	_ "spaceofcheng/services/routers"
+	"spaceofcheng/services/bootstrap"
 
 	"github.com/astaxie/beego"
 )
@@ -11,5 +11,8 @@ func main() {
 		beego.BConfig.WebConfig.DirectoryIndex = true
 		beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
 	}
+
+	bootstrap.SystemInit()
+
 	beego.Run()
 }

models/card/card.go

@@ -481,7 +481,7 @@ func (m *CardDAO) GetCustomerCardByCustomerAndSaleCount(customerid, saleid strin
 // GetCustomerCardByCustomerAndSale 获取用户的领取记录
 func (m *CardDAO) GetCustomerCardByCustomerAndSale(customerid, saleid string, page, pageSize int) ([]model.TaCustomerCard, error) {
 	var customerCard []model.TaCustomerCard
-	err := m.db.Where("customer_id=?", customerid).And("sales_id=?", saleid).Desc("status").Limit(pageSize, (page-1)*pageSize).Find(&customerCard)
+	err := m.db.Where("customer_id=?", customerid).And("sales_id=?", saleid).OrderBy("status asc,receive_date desc").Limit(pageSize, (page-1)*pageSize).Find(&customerCard)
 	return customerCard, err
 }
 
@@ -528,3 +528,18 @@ func (m *CardDAO) SaveCardChannel(channelid, cardid string) error {
 	_, err := m.db.Insert(&cardChannel)
 	return err
 }
+
+func (m *CardDAO) GetSysCardList(caseid string) ([]model.TaCouponCard, error) {
+	var card []model.TaCouponCard
+	sql := `SELECT
+	* 
+FROM
+	ta_coupon_card 
+WHERE
+	send_type = '` + models.GIVE_TYPE_SYSTEM + `'
+	and case_id = '` + caseid + `'
+	and  status > ` + strconv.Itoa(models.STATUS_DEL)
+	err := m.db.Sql(sql).Find(&card)
+	return card, err
+
+}

models/channel/channel.go

@@ -46,7 +46,7 @@ func (m *ChannelDAO) GetChannels(caseid string, page int, pageSize int) ([]Chann
 	from ta_channel a 
 	inner join sys_case b on a.case_id = b.case_id 
 	where a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `') and  a.status > ` + strconv.Itoa(models.STATUS_DEL)
-	sql += ` order by a.create_date desc limit ` + strconv.Itoa(page-1) + `, ` + strconv.Itoa(pageSize)
+	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&channels)
 	return channels, err
 }

models/constant.go

@@ -55,7 +55,7 @@ const (
 	CONSUME_INNER       = "sys user"
 	CONSUME_COUPON      = "coupon"
 	CONSUME_POINTS      = "points"
-	CONSUME_COINCHG     = "cheng-coin"
+	CONSUME_COINCHG     = "cheng-coin" // 城币就是 VIP
 	CONSUME_COUPON_COIN = "coupon-coin"
 )
 
@@ -172,8 +172,71 @@ const (
 const (
 	QRCODE_TYPE_COURSE = "course"
 	QRCODE_TYPE_PRIZE  = "prize"
+	QRCODE_TYPE_FLASH  = "flash"
 )
 
 const (
 	ADMIN_ID = "1"
 )
+
+// 奖品类型
+const (
+	PRIZE_TYPE_COUPONCARD = "couponcard"
+	PRIZE_TYPE_THIRD      = "third"
+
+	PRIZE_TYPE_COUPON = "coupon"
+	PRIZE_TYPE_CARD   = "card"
+)
+
+// 参与类型设置
+const (
+	JOINTYPE_NEWUSER = "newuser"
+	JOINTYPE_NO      = "no"
+)
+
+// 抽奖分享设置
+const (
+	SHARETYPE_NEWUSER = "newuser"
+	SHARETYE_NO       = "no"
+)
+
+// 抢购用户类型
+const (
+	FLASHBUY_USER_NEW = "newuser"
+	FLASHBUY_USER_NO  = "no"
+)
+
+// 抽奖次数类型
+const (
+	NUMTYPE_REPART    = "repeat"
+	NUMTYPE_NOTREPART = "no_repeat"
+)
+
+const (
+	FLASH_BUY_ACTIVE   = "active"
+	FLASH_BUY_INACTIVE = "inactive"
+	FLASH_BUY_OVER     = "over"
+)
+
+const (
+	FLASH_VALIDATE_DAYS = "days"
+	FLASH_VALIDATE_DATE = "date"
+)
+
+const (
+	COUPONCARD_USETYPE_LUCKDRAW = "luckdraw"
+	COUPONCARD_USETYPE_SYS      = "sysactive"
+)
+
+const (
+	// 送券
+	ActGiveCoupon = "giveCoupon"
+	ActGiveCard   = "giveCard"
+)
+
+// 抽奖次数间隔
+const (
+	INTERVAL_DAY   = "day"
+	INTERVAL_WEEK  = "week"
+	INTERVAL_MONTH = "month"
+)

models/coupon/coupon.go

@@ -236,6 +236,18 @@ func (m *CouponDAO) SaveCustomerCoupons(cps []model.TaCustomerCoupon) error {
 	return nil
 }
 
+// IncreseCouponUsedNum 增加优惠券使用数量
+func (m *CouponDAO) IncreseCouponUsedNum(cpID string, num ...int) error {
+	sql := `update ta_coupon set used_count=used_count+? where coupon_id=?`
+	numAdd := 1
+	if len(num) > 0 && num[0] != 0 {
+		numAdd = num[0]
+	}
+
+	_, err := m.db.Exec(sql, numAdd, cpID)
+	return err
+}
+
 // CheckCustCoupon 检查客户是否已经有了该卡券
 // 如果用户有了卡券, 但是用过了，或者卡券过期了，仍然可以再次拥有
 func (m *CouponDAO) CheckCustCoupon(custID, couponID string, startDate, endDate time.Time) ([]model.TaCustomerCoupon, error) {
@@ -301,7 +313,7 @@ func (m *CouponDAO) GetCouponBySendType(caseids, sendtype string) ([]model.TaCou
 // GetCaseUsableCoupon 获取案场可用优惠券信息
 func (m *CouponDAO) GetCaseUsableCoupon(caseid, userid string, page, pageSize int) ([]CaseCouponDetail, error) {
 	var Coupons []CaseCouponDetail
-	sql := `select * from ta_coupon where case_id=? and status=? and DATE_FORMAT(end_date, '%Y-%m-%d')>=DATE_FORMAT(NOW(), '%Y-%m-%d') and send_type=? order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	sql := `select * from ta_coupon where case_id=? and status=? and (DATE_FORMAT(end_date, '%Y-%m-%d')>=DATE_FORMAT(NOW(), '%Y-%m-%d') or valid_days>0) and send_type=? order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL, models.GIVE_TYPE_CASE).Find(&Coupons)
 	for inx, coupon := range Coupons {
 		if userid != "" {
@@ -330,7 +342,7 @@ func (m *CouponDAO) GetCouponShareByCouponID(couponid string) (*model.TaCouponSh
 // GetCaseUsableCouponCount 获取案场可用优惠券数量
 func (m *CouponDAO) GetCaseUsableCouponCount(caseid, userid string) (int, error) {
 	var Coupons []CaseCouponDetail
-	sql := `select * from ta_coupon where case_id=? and status=? and DATE_FORMAT(end_date, '%Y-%m-%d')>=DATE_FORMAT(NOW(), '%Y-%m-%d') and send_type=?`
+	sql := `select * from ta_coupon where case_id=? and status=? and (DATE_FORMAT(end_date, '%Y-%m-%d')>=DATE_FORMAT(NOW(), '%Y-%m-%d') or valid_days>0) and send_type=?`
 	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL, models.GIVE_TYPE_CASE).Find(&Coupons)
 
 	return len(Coupons), err
@@ -530,7 +542,7 @@ func (m *CouponDAO) GetCustomerCouponByCustomerAndSaleCount(customerid, saleid s
 // GetCustomerCouponByCustomerAndSale 获取用户的领取记录
 func (m *CouponDAO) GetCustomerCouponByCustomerAndSale(customerid, saleid string, page, pageSize int) ([]model.TaCustomerCoupon, error) {
 	var customerCoupon []model.TaCustomerCoupon
-	err := m.db.Where("customer_id=?", customerid).And("sales_id=?", saleid).Desc("status").Limit(pageSize, (page-1)*pageSize).Find(&customerCoupon)
+	err := m.db.Where("customer_id=?", customerid).And("sales_id=?", saleid).OrderBy("status asc,receive_date desc").Limit(pageSize, (page-1)*pageSize).Find(&customerCoupon)
 	return customerCoupon, err
 }
 
@@ -574,3 +586,17 @@ func (m *CouponDAO) SaveCouponChannel(channelid, couponid string) error {
 	_, err := m.db.Insert(&couponChannel)
 	return err
 }
+
+func (m *CouponDAO) GetSysCouponByCase(caseid string) ([]model.TaCoupon, error) {
+	var coupon []model.TaCoupon
+	sql := `SELECT
+	* 
+FROM
+	ta_coupon 
+WHERE
+	send_type = '` + models.GIVE_TYPE_SYSTEM + `'
+	and case_id = '` + caseid + `'
+	and status > ` + strconv.Itoa(models.STATUS_DEL)
+	err := m.db.Sql(sql).Find(&coupon)
+	return coupon, err
+}

models/course/order.go

@@ -12,7 +12,7 @@ import (
 )
 
 // SaveCourseOrder 保存订单
-func (m *CourseDAO) SaveCourseOrder(order *model.TaCourseOrders) error {
+func (m *CourseDAO) SaveCourseOrder(order *model.TaCourseOrders) (*model.TaCourseOrders, error) {
 
 	if order.OrdersId == "" {
 		order.OrdersId = guid.NewGUIDString()
@@ -26,7 +26,7 @@ func (m *CourseDAO) SaveCourseOrder(order *model.TaCourseOrders) error {
 	order.OrdersNo = ordersno
 	order.CreateDate = time.Now()
 	_, err := m.db.Insert(order)
-	return err
+	return order, err
 }
 
 // GetOrderByID 根据id获取订单明细
@@ -62,12 +62,28 @@ func (m *CourseDAO) SaveOrdersCoupon(coupon *model.TaCourseOrdersCoupon, order *
 	coupon.OrdersCouponId = utils.GetGUID()
 	coupon.Status = models.STATUS_NORMAL
 	coupon.CreateDate = time.Now().Local()
-	if _, err := m.db.Insert(coupon); err != nil {
-		return err
+	_, err := m.db.Insert(coupon)
+	return err
+}
+
+// UpdateOrderPay 更新订单为已支付
+func (m *CourseDAO) UpdateOrderPay(info *model.TaCourseOrders) error {
+	if info.ActualAmount == "" {
+		info.ActualAmount = "0.0"
 	}
 
-	// 更新优惠券已使用信息
-	sql := `update ta_coupon set used_count=used_count+1 where coupon_id='` + coupon.CouponId + `'`
-	_, err := m.db.Exec(sql)
+	if info.CouponAmount == "" {
+		info.CouponAmount = "0.0"
+	}
+
+	info.IsPay = models.BOOL_TRUE
+	info.Status = models.STATUS_NORMAL
+	var cols = []string{
+		"is_pay",
+		"status",
+		"actual_amount",
+		"coupon_amount",
+	}
+	_, err := m.db.Cols(cols...).Where("orders_id=?", info.OrdersId).Update(info)
 	return err
 }

models/customer/account.go

@@ -124,3 +124,20 @@ func (m *CustomerDAO) GetAccountByCust(id string) (*model.TaCustomerAccount, err
 
 	return acc, nil
 }
+
+// GetCustomerVipAmount 获取用户vip金额
+func (m *CustomerDAO) GetCustomerVipAmount(id string) (string, error) {
+	type amount struct {
+		Balance string
+	}
+	sql := `select sum(balance) as balance from ta_customer_vip where customer_id=?`
+	var vip = amount{}
+	_, err := m.db.Sql(sql, id).Get(&vip)
+	if err != nil {
+		return "0.00", err
+	}
+	if vip.Balance == "" {
+		vip.Balance = "0.00"
+	}
+	return vip.Balance, nil
+}

models/customer/customer.go

@@ -5,6 +5,7 @@ import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
 	"strings"
 	"time"
 
@@ -128,7 +129,7 @@ func (m *CustomerDAO) GetCustWithWXByOpenID(openid string) (*CustWithWX, error)
 
 	cust := CustWithWX{}
 	query := `
-	SELECT a.*,b.*, b.user_id as map_user,c.type_id as user_type_id,e.real_name
+	SELECT a.*,b.*, b.user_id as map_user,c.type_id as user_type_id,e.real_name,e.recommend_code
 	FROM
 		ta_user_mapping a
 	LEFT JOIN ta_customer b ON a.user_id = b.customer_id
@@ -262,3 +263,36 @@ func (m *CustomerDAO) GetCustomerByID(id string) (*model.TaCustomer, error) {
 
 	return cust, nil
 }
+
+func (m *CustomerDAO) GetSalesByRecommendCode(recommendCode string) (*model.SysUser, error) {
+	if recommendCode == "" {
+		return nil, errors.New("获取相关人员信息失败")
+	}
+	user := model.SysUser{}
+	has, err := m.db.Where("recommend_code=?", recommendCode).Get(&user)
+	if err != nil {
+		return nil, err
+	}
+
+	if !has {
+		return nil, nil
+	}
+
+	return &user, nil
+}
+
+func (m *CustomerDAO) GetSalesCaseById(userId string) (*model.SysUserCase, error) {
+	var userCase []model.SysUserCase
+	sql := `SELECT
+	* 
+FROM
+	sys_user_case 
+WHERE
+	is_belong = 1 
+	AND user_id = '` + userId + `'and status > ` + strconv.Itoa(models.STATUS_DEL)
+	err := m.db.Sql(sql).Find(&userCase)
+	if len(userCase) <= 0 {
+		return nil, err
+	}
+	return &userCase[0], err
+}

models/customer/types.go

@@ -14,4 +14,5 @@ type CustWithWX struct {
 	BelongCaseId        string
 	BelongCaseStatus    int
 	RealName            string
+	RecommendCode       string
 }

models/customer/vip.go

@@ -0,0 +1,35 @@
+package customer
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"time"
+)
+
+// GetValidVIPCards 依据客户ID 获取 VIP 卡
+// 按照过期时间升序, 即 将到期的在最上面
+// VIP 卡可以跨案场使用
+func (m *CustomerDAO) GetValidVIPCards(custID string) (vips []model.TaCustomerVip, err error) {
+	now := time.Now().Local().Format("2006-01-02 15:04:05")
+
+	err = m.db.Where("customer_id=?", custID).
+		And("status=?", models.STATUS_NORMAL).
+		And(`DATE_FORMAT(begin_date, "%Y-%m-%d %T")<=?`, now).
+		And(`DATE_FORMAT(end_date, "%Y-%m-%d %T")>=?`, now).
+		And("balance>0").
+		Asc("end_date").
+		Find(&vips)
+	return
+}
+
+// UpdateCustVipCardAmount 更新VIP账户
+func (m *CustomerDAO) UpdateCustVipCardAmount(vip *model.TaCustomerVip, change float64) error {
+	sql := `UPDATE ta_customer_vip
+		SET balance = balance - ?,
+			pay_amount = pay_amount + ?
+		WHERE customer_vip_id = ?
+	`
+
+	_, err := m.db.Exec(sql, change, change, vip.CustomerVipId)
+	return err
+}

models/customerremark/customerremark.go

@@ -0,0 +1,148 @@
+package customerremark
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strconv"
+	"time"
+
+	"github.com/go-xorm/xorm"
+)
+
+// CustomerRemarkDAO 当前数据库操作对象
+type CustomerRemarkDAO struct {
+	ctx *utils.Context
+	db  *xorm.Session
+}
+type CustomerCardCoupon struct {
+	ItemName     string
+	VerifyStatus string
+	ReceiveDate  time.Time
+}
+type customerHistory struct {
+	model.TaSaleCustomerRemark `xorm:"extends"`
+	Name                       string
+	CustomerName               string
+	Phone                      string
+}
+
+// NewCustomerRemarkDAO New Inst
+func NewCustomerRemarkDAO(ctx *utils.Context) *CustomerRemarkDAO {
+	return &CustomerRemarkDAO{
+		ctx: ctx,
+		db:  ctx.DB,
+	}
+}
+func (m *CustomerRemarkDAO) GetRemarkList(salesId, customerId string, page, pageSize int) ([]customerHistory, error) {
+	var remark []customerHistory
+	sql := `SELECT
+	a.*,
+	b.name,
+	b.customer_name,
+	b.phone
+FROM
+	ta_sale_customer_remark a
+	INNER JOIN ta_customer b ON a.customer_id = b.customer_id
+WHERE
+	a.sales_id = '` + salesId + `'
+	and a.customer_id = '` + customerId + `'
+	order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	err := m.db.Sql(sql).Find(&remark)
+	return remark, err
+}
+func (m *CustomerRemarkDAO) GetRemarkListCount(salesId, customerId string) (int, error) {
+	var remark []model.TaSaleCustomerRemark
+	sql := `SELECT
+	* 
+FROM
+	ta_sale_customer_remark 
+WHERE
+	sales_id = '` + salesId + `'
+	and customer_id = '` + customerId + `'`
+	err := m.db.Sql(sql).Find(&remark)
+	return len(remark), err
+}
+
+func (m *CustomerRemarkDAO) AddRemark(remark model.TaSaleCustomerRemark) (*model.TaSaleCustomerRemark, error) {
+	remark.SalesCustomerRemarkId = utils.GetGUID()
+	remark.CreateDate = time.Now()
+	remark.Status = models.STATUS_NORMAL
+	_, err := m.db.Insert(remark)
+	return &remark, err
+}
+
+func (m *CustomerRemarkDAO) SearchCustomer(customerInfo, salesId string) (model.TaCustomer, error) {
+	var customer model.TaCustomer
+	sql := `SELECT
+	* 
+FROM
+	ta_customer 
+WHERE
+	(phone = '` + customerInfo + `'
+	or name ='` + customerInfo + `')
+	and recommend_id = '` + salesId + `'`
+	err := m.db.Sql(sql).Find(&customer)
+	return customer, err
+}
+func (m *CustomerRemarkDAO) CustomerReceiveRecord(customerId, salesId string, page, pageSize int) ([]CustomerCardCoupon, error) {
+	var customerReceive []CustomerCardCoupon
+	sql := `SELECT
+	customer_card_name AS item_name,
+	verify_status,
+	receive_date 
+FROM
+	ta_customer_card 
+	Where customer_id ='` + customerId + `'
+	and sales_id = '` + salesId + `'
+	UNION
+SELECT
+	customer_coupon_name AS item_name,
+	CASE status 
+	WHEN 0 THEN 'expire'
+	WHEN 1 THEN 'usable'
+	WHEN 2 THEN 'used' END as verify_status,
+	receive_date 
+FROM
+	ta_customer_coupon
+	Where customer_id = '` + customerId + `'
+	and sales_id = '` + salesId + `'
+	order by receive_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	err := m.db.Sql(sql).Find(&customerReceive)
+	return customerReceive, err
+
+}
+func (m *CustomerRemarkDAO) CustomerReceiveRecordCount(customerId, salesId string) (int, error) {
+	var customerReceive []CustomerCardCoupon
+	sql := `SELECT
+	customer_card_name AS item_name,
+	verify_status,
+	receive_date 
+FROM
+	ta_customer_card 
+	Where customer_id ='` + customerId + `'
+	and sales_id = '` + salesId + `'
+	UNION
+SELECT
+	customer_coupon_name AS item_name,
+	CASE status 
+	WHEN 0 THEN 'expire'
+	WHEN 1 THEN 'usable'
+	WHEN 2 THEN 'used' END as verify_status,
+	receive_date 
+FROM
+	ta_customer_coupon
+	Where customer_id = '` + customerId + `'
+	and sales_id = '` + salesId + `'`
+	err := m.db.Sql(sql).Find(&customerReceive)
+	return len(customerReceive), err
+
+}
+
+func (m *CustomerRemarkDAO) IsExist(recommendCode string) (int, error) {
+	var user []model.SysUser
+	sql := `select * from sys_user where recommend_code = '` + recommendCode + `' 
+	and status > ` + strconv.Itoa(models.STATUS_DEL)
+	err := m.db.Sql(sql).Find(&user)
+	return len(user), err
+}

models/flashbuy/flashbuy.go

@@ -0,0 +1,351 @@
+package flashbuy
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/go-xorm/xorm"
+)
+
+// FlashbuyDAO 当前数据库操作对象
+type FlashbuyDAO struct {
+	ctx *utils.Context
+	db  *xorm.Session
+}
+
+// NewFlashbuyDAO New Inst
+func NewFlashbuyDAO(ctx *utils.Context) *FlashbuyDAO {
+	return &FlashbuyDAO{
+		ctx: ctx,
+		db:  ctx.DB,
+	}
+}
+
+type FlashBuy struct {
+	model.TaFlashBuy `xorm:"extends"`
+	CaseName         string
+}
+type CustomerFlashBuy struct {
+	model.TaCustomerFlashBuy `xorm:"extends"`
+	CaseName                 string
+	CustomerName             string
+	Phone                    string
+	FlashBuyName             string
+}
+type CustomerFlashResult struct {
+	model.TaCustomerFlashBuy `xorm:"extends"`
+	FlashBuyName             string
+}
+type CustomerFlashDetail struct {
+	model.TaCustomerFlashBuy `xorm:"extends"`
+	CustomerQrcode           string
+	CaseName                 string
+	IsAttend                 int
+}
+
+func (m *FlashbuyDAO) GetFlashBuyList(caseid, flashBuyName, flashBuyStatus string, page, pageSize int) ([]FlashBuy, error) {
+	var flashBuy []FlashBuy
+	sql := `SELECT
+	a.*,
+	b.case_name 
+FROM
+	ta_flash_buy a
+	INNER JOIN sys_case b ON a.case_id = b.case_id
+	Where a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
+	and a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
+	if flashBuyName != "" {
+		sql += ` and a.flash_buy_name like '%` + flashBuyName + `%'`
+	}
+	if flashBuyStatus != "" {
+		sql += ` and a.flash_buy_status ='` + flashBuyStatus + `'`
+	}
+	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	err := m.db.Sql(sql).Find(&flashBuy)
+	return flashBuy, err
+}
+
+func (m *FlashbuyDAO) GetFlashBuyListCount(caseid, flashBuyName, flashBuyStatus string) (int, error) {
+	var flashBuy []model.TaFlashBuy
+	sql := `SELECT
+	a.*
+FROM
+	ta_flash_buy a
+	Where a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
+	and a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
+	if flashBuyName != "" {
+		sql += ` and a.flash_buy_name like '%` + flashBuyName + `%'`
+	}
+	if flashBuyStatus != "" {
+		sql += ` and a.flash_buy_status ='` + flashBuyStatus + `'`
+	}
+	err := m.db.Sql(sql).Find(&flashBuy)
+	return len(flashBuy), err
+}
+
+func (m *FlashbuyDAO) GetFlashBuyById(flashBuyId string) (*model.TaFlashBuy, error) {
+	var flashBuy []model.TaFlashBuy
+	err := m.db.Where("flash_buy_id = ?", flashBuyId).And("status > ?", models.STATUS_DEL).Find(&flashBuy)
+	if err != nil {
+		return nil, err
+	}
+	if len(flashBuy) > 0 {
+		return &flashBuy[0], nil
+	}
+	return nil, nil
+}
+
+func (m *FlashbuyDAO) AddNewFlashBuy(flashbuy model.TaFlashBuy) (*model.TaFlashBuy, error) {
+	flashbuy.FlashBuyId = utils.GetGUID()
+	flashbuy.Status = models.STATUS_NORMAL
+	flashbuy.CreateDate = time.Now()
+	_, err := m.db.Insert(flashbuy)
+	return &flashbuy, err
+}
+
+func (m *FlashbuyDAO) DeleteFlashBuy(flashBuyId string) error {
+	var flashBuy = model.TaFlashBuy{
+		FlashBuyId: flashBuyId,
+		Status:     models.STATUS_DEL,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("flash_buy_id = ?", flashBuy.FlashBuyId).Update(flashBuy)
+	return err
+}
+
+func (m *FlashbuyDAO) UpdateFlashBuy(flashBuyId, flashBuyStatus string) error {
+	var flashBuy = model.TaFlashBuy{
+		FlashBuyId:     flashBuyId,
+		FlashBuyStatus: flashBuyStatus,
+	}
+	var cols = []string{
+		"flash_buy_status",
+	}
+	_, err := m.db.Cols(cols...).Where("flash_buy_id =?", flashBuy.FlashBuyId).Update(flashBuy)
+	return err
+}
+
+func (m *FlashbuyDAO) EditFlashBuy(flashBuy model.TaFlashBuy) error {
+	var cols = []string{
+		"flash_buy_name",
+		"flash_buy_info",
+	}
+	_, err := m.db.Cols(cols...).Where("flash_buy_id = ?", flashBuy.FlashBuyId).Update(flashBuy)
+	return err
+}
+func (m *FlashbuyDAO) VerifyFlashBuy(customerFlashBuyId string) error {
+	var customerFlashBuy = model.TaCustomerFlashBuy{
+		CustomerFlashBuyId: customerFlashBuyId,
+		VerifyStatus:       models.VERIFY_USED,
+		VerifyDate:         time.Now(),
+	}
+	var cols = []string{
+		"verify_status",
+		"verify_date",
+	}
+	_, err := m.db.Cols(cols...).Where("customer_flash_buy_id = ?", customerFlashBuy.CustomerFlashBuyId).Update(customerFlashBuy)
+	return err
+}
+
+func (m *FlashbuyDAO) GetCustomerFlashBuyById(flashBuyId, phone string, page, pageSize int) ([]CustomerFlashBuy, error) {
+	var customerFlashBuy []CustomerFlashBuy
+	sql := `SELECT
+	a.*,
+	b.customer_name,
+	b.phone,
+	c.case_name,
+	d.flash_buy_id
+FROM
+	ta_customer_flash_buy a
+	INNER JOIN ta_customer b ON a.customer_id = b.customer_id
+	INNER JOIN sys_case c ON a.case_id = c.case_id
+	INNER JOIN ta_flash_buy d ON a.flash_buy_id = d.flash_buy_id
+WHERE
+	a.flash_buy_id = '` + flashBuyId + `' 
+	and a.status >` + strconv.Itoa(models.STATUS_DEL)
+	if phone != "" {
+		sql += ` and b.phone like '%` + phone + `%'`
+	}
+	sql += ` order by a.create_date desc  limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	err := m.db.Sql(sql).Find(&customerFlashBuy)
+	return customerFlashBuy, err
+
+}
+func (m *FlashbuyDAO) GetCustomerFlashBuyByIdCount(flashBuyId, phone string) (int, error) {
+	var customerFlashBuy []CustomerFlashBuy
+	sql := `SELECT
+	a.*,
+	b.customer_name,
+	b.phone,
+	c.case_name 
+FROM
+	ta_customer_flash_buy a
+	INNER JOIN ta_customer b ON a.customer_id = b.customer_id
+	INNER JOIN sys_case c ON a.case_id = c.case_id 
+WHERE
+	a.flash_buy_id = '` + flashBuyId + `' 
+	and a.status >` + strconv.Itoa(models.STATUS_DEL)
+	if phone != "" {
+		sql += ` and b.phone like '%` + phone + `%'`
+	}
+	err := m.db.Sql(sql).Find(&customerFlashBuy)
+	return len(customerFlashBuy), err
+}
+
+func (m *FlashbuyDAO) GetCustomerFlashBuyByQr(customerFlashBuyId, caseId string) (*CustomerFlashBuy, error) {
+	var customerFlashBuy []CustomerFlashBuy
+	sql := `SELECT
+	a.*,
+	b.customer_name,
+	b.phone,
+	c.case_name,
+	d.flash_buy_name
+FROM
+	ta_customer_flash_buy a
+	INNER JOIN ta_customer b ON a.customer_id = b.customer_id
+	INNER JOIN sys_case c ON a.case_id = c.case_id 
+	INNER JOIN ta_flash_buy d ON a.flash_buy_id = d.flash_buy_id
+WHERE
+	a.customer_flash_buy_id ='` + customerFlashBuyId + `' and a.case_id = '` + caseId + `'`
+	sql += ` and a.validate_start <= now() and a.validate_end >= now()`
+	err := m.db.Sql(sql).Find(&customerFlashBuy)
+	if len(customerFlashBuy) > 0 {
+		return &customerFlashBuy[0], err
+	}
+	return nil, nil
+}
+
+func (m *FlashbuyDAO) GetCustomerFlashBuyByCustomerId(customerId string, page, pageSize int) ([]CustomerFlashResult, error) {
+	var customerResult []CustomerFlashResult
+	sql := `select a.*,b.flash_buy_name
+	 from ta_customer_flash_buy a 
+	 inner join ta_flash_buy b 
+	 on a.flash_buy_id = b.flash_buy_id
+	 where a.customer_id = '` + customerId + `'`
+	sql += ` order by a.validate_start desc  limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	err := m.db.Sql(sql).Find(&customerResult)
+	return customerResult, err
+
+}
+
+func (m *FlashbuyDAO) GetCustomerFlashBuyByCustomerIdCount(customerId string) (int, error) {
+	var customerResult []CustomerFlashResult
+	sql := `select a.*,b.flash_buy_name
+	 from ta_customer_flash_buy a 
+	 inner join ta_flash_buy b 
+	 on a.flash_buy_id = b.flash_buy_id
+	 where a.customer_id = '` + customerId + `'`
+	err := m.db.Sql(sql).Find(&customerResult)
+	return len(customerResult), err
+
+}
+
+func (m *FlashbuyDAO) GetCustomerFlashBuyId(customerFlashBuyId string) (*CustomerFlashDetail, error) {
+	var customerDetail []CustomerFlashDetail
+	sql := `SELECT
+	a.*,
+	b.customer_qrcode,
+	c.case_name
+FROM
+	ta_customer_flash_buy a
+	INNER JOIN ta_customer_course_qrcode b ON a.customer_flash_buy_id = b.customer_course_id
+	INNER JOIN sys_case c ON a.case_id = c.case_id
+	WHERE a.customer_flash_buy_id = '` + customerFlashBuyId + `'`
+	err := m.db.Sql(sql).Find(&customerDetail)
+	if len(customerDetail) > 0 {
+		return &customerDetail[0], err
+	}
+	return nil, err
+}
+
+// GetCustomerFlashBuy 获取用户抢购信息
+func (m *FlashbuyDAO) GetCustomerFlashBuy(id, customerid string) ([]model.TaCustomerFlashBuy, error) {
+	var buys []model.TaCustomerFlashBuy
+	err := m.db.Where("flash_buy_id=?", id).And("customer_id=?", customerid).And("status>?", models.STATUS_DEL).Find(&buys)
+	return buys, err
+}
+
+// UpdateFlashBuyJoin 更新抢购参与人数
+func (m *FlashbuyDAO) UpdateFlashBuyJoin(id string) (int64, error) {
+	sql := `update ta_flash_buy set join_num = join_num + 1 where flash_buy_id=? and join_num < flash_buy_max_attendant`
+	result, err := m.db.Exec(sql, id)
+	if err != nil {
+		return 0, err
+	}
+
+	rowCount, err := result.RowsAffected()
+	return rowCount, err
+}
+
+// SaveCustomerFlashBuy 新增用户抢购信息
+func (m *FlashbuyDAO) SaveCustomerFlashBuy(cstFlashBuy model.TaCustomerFlashBuy) (*model.TaCustomerFlashBuy, error) {
+	cstFlashBuy.Status = models.STATUS_NORMAL
+	cstFlashBuy.CustomerFlashBuyId = utils.GetGUID()
+	cstFlashBuy.CreateDate = time.Now()
+	cstFlashBuy.VerifyStatus = models.VERIFY_USEABLE
+	_, err := m.db.Insert(cstFlashBuy)
+	return &cstFlashBuy, err
+}
+
+func (m *FlashbuyDAO) GetFlashModelList() ([]model.TdFlashbuyModel, error) {
+	var model []model.TdFlashbuyModel
+	sql := `select * from td_flashbuy_model`
+	err := m.db.Sql(sql).Find(&model)
+	return model, err
+}
+
+func (m *FlashbuyDAO) AddNewFlashBuyCustomer(customer model.TaFlashBuyCustomer) error {
+	customer.CreateDate = time.Now()
+	customer.FlashBuyCustomerId = utils.GetGUID()
+	customer.IsAttend = 1
+	_, err := m.db.Insert(customer)
+	return err
+}
+
+func (m *FlashbuyDAO) UpdateFlashBuyCustomer(customerId, flashBuyId string) error {
+	var customer = model.TaFlashBuyCustomer{
+		CustomerId: customerId,
+		IsNew:      0,
+		IsAttend:   0,
+	}
+	var cols = []string{
+		"is_new",
+		"is_attend",
+	}
+	_, err := m.db.Cols(cols...).Where("customer_id = ?", customer.CustomerId).And("flash_buy_id =?", flashBuyId).Update(customer)
+	return err
+}
+
+func (m *FlashbuyDAO) IsFlashBuyCustomer(customerId, flashBuyId string) (*model.TaFlashBuyCustomer, error) {
+	var customer []model.TaFlashBuyCustomer
+	sql := `SELECT
+	* 
+FROM
+	ta_flash_buy_customer 
+WHERE
+	customer_id = '` + customerId + `'
+	and flash_buy_id = '` + flashBuyId + `'`
+	err := m.db.Sql(sql).Find(&customer)
+	if len(customer) <= 0 {
+		return nil, err
+	}
+	return &customer[0], err
+}
+
+func (m *FlashbuyDAO) IsRecord(customerId, flashBuyId string) (int, error) {
+	var customer []model.TaFlashBuyCustomer
+	sql := `SELECT
+	* 
+FROM
+	ta_flash_buy_customer 
+WHERE
+	customer_id = '` + customerId + `'
+	and flash_buy_id = '` + flashBuyId + `'`
+	err := m.db.Sql(sql).Find(&customer)
+	return len(customer), err
+}

models/goods/orders.go

@@ -47,8 +47,6 @@ func (m *GoodsDAO) SaveOrders(order *model.TaGoodsOrders) error {
 	// order.OrdersId = guid.NewGUIDString()
 	order.OrgId = caseInfo.OrgId
 	order.CreateDate = now
-	order.Status = models.STATUS_NORMAL
-	order.IsPay = models.BOOL_TRUE // 默认已支付
 	order.CouponAmount = "0"
 	order.IsIntimidate = INTIMIDATE_NO
 	order.DupKey = utils.GetFiveSeconds(now) + order.UserId + order.TableId + strconv.Itoa(order.Status)
@@ -77,6 +75,12 @@ func (m *GoodsDAO) UpdateOrdersIntimidate(id string) error {
 		"orders_id",
 		"is_intimidate",
 	}
+
+	return m.UpdateOrders(&orders, cols)
+}
+
+// UpdateOrders  更新订单
+func (m *GoodsDAO) UpdateOrders(orders *model.TaGoodsOrders, cols []string) error {
 	_, err := m.db.Cols(cols...).Where("orders_id=?", orders.OrdersId).Update(orders)
 	return err
 }
@@ -101,53 +105,29 @@ func (m *GoodsDAO) SaveOrdersDetail(list []model.TaGoodsOrdersDetail, ordersID s
 // SaveOrdersCoupon 保存订单优惠券
 func (m *GoodsDAO) SaveOrdersCoupon(coupon *model.TaGoodsOrdersCoupon, order *model.TaGoodsOrders) error {
 	if order.OrdersId == "" {
-		return errors.New("内部错误, 订单事务顺序出错")
+		return errors.New("保存订单券失败, 订单不存在")
 	}
 	coupon.OrdersCouponId = utils.GetGUID()
 	coupon.Status = models.STATUS_NORMAL
 	coupon.CreateDate = time.Now().Local()
-	if _, err := m.db.Insert(coupon); err != nil {
-		return err
-	}
+	_, err := m.db.Insert(coupon)
 
-	// 更新优惠券已使用信息
-	sql := `update ta_coupon set used_count=used_count+1 where coupon_id='` + coupon.CouponId + `'`
-	_, err := m.db.Exec(sql)
 	return err
+}
 
-	// var couponAmount float64 = 0
-
-	// // 补充优惠券表字段
-	// for inx := range coupons {
-	// 	coupons[inx].OrdersCouponId = guid.NewGUIDString()
-	// 	coupons[inx].OrdersId = order.OrdersId
-	// 	coupons[inx].OrdersNo = order.OrdersNo
-	// 	coupons[inx].OrgId = order.OrgId
-	// 	coupons[inx].Status = models.STATUS_NORMAL
-	// 	coupons[inx].CreateDate = time.Now().Local()
-
-	// 	userAmount, _ := strconv.ParseFloat(coupons[inx].UsedAmount, 64)
-	// 	couponAmount += userAmount
-	// }
-
-	// // 反向更新 订单主表
-	// totalAmount, _ := strconv.ParseFloat(order.Amount, 64)
-
-	// order.CouponAmount = strconv.FormatFloat(couponAmount, 'f', -1, 32)
-	// order.ActualAmount = strconv.FormatFloat((totalAmount - couponAmount), 'f', -1, 32)
-
-	// if _, err := m.db.Insert(&coupons); err != nil {
-	// 	return err
-	// }
-
-	// if _, err := m.db.
-	// 	Where("orders_id=?", order.OrdersId).
-	// 	Cols([]string{"coupon_amount", "actual_amount"}...).
-	// 	Update(order); err != nil {
-	// 	return err
-	// }
-
-	// return nil
+// GetCouponByOrdersID 获取优惠券订单
+func (m *GoodsDAO) GetCouponByOrdersID(ordersID string) ([]model.TaCoupon, error) {
+	var res []model.TaCoupon
+	query := `
+		SELECT t.*
+		FROM ta_coupon t
+		JOIN ta_goods_orders_coupon s ON t.coupon_id = s.coupon_id
+		WHERE s.orders_id = ?
+		ORDER BY t.create_date
+	`
+
+	err := m.db.SQL(query, ordersID).Find(&res)
+	return res, err
 }
 
 func (m *GoodsDAO) getCaseByID(caseID string) (*model.SysCase, error) {
@@ -237,6 +217,29 @@ func (m *GoodsDAO) GetOrdersByID(id string) (*OrdersWithGoods, error) {
 	return res, nil
 }
 
+func (m *GoodsDAO) GetOrdersDetailByID(id string, status ...int) (*OrdersDetail, error) {
+	sta := models.STATUS_NORMAL
+	if len(status) > 0 {
+		sta = status[0]
+	}
+
+	res := new(OrdersDetail)
+	if _, err := m.db.Table("ta_goods_orders").
+		Where("orders_id=?", id).
+		And("status=?", sta).
+		Get(res); err != nil {
+		return nil, err
+	}
+
+	details, err := m.GetOrderDetailByOrder(res.OrdersId)
+	if err != nil {
+		return nil, err
+	}
+
+	res.Goods = details
+	return res, nil
+}
+
 // GetOrdersByRecord 根据
 func (m *GoodsDAO) GetOrdersByRecord(recordid string) ([]OrdersWithGoods, error) {
 	var orderList []OrdersWithGoods
@@ -338,8 +341,8 @@ func (m *GoodsDAO) GetOrderDetailByUser(caseid, userid string) ([]model.TaGoodsO
 	var details []model.TaGoodsOrdersDetail
 	sql := `select a.* from ta_goods_orders_detail a inner join ta_goods_orders b on a.orders_id=b.orders_id
 		inner join ta_customer c on b.user_id = c.customer_id
-	where c.user_id=? and b.status>? and b.case_id=? and b.pay_type = ? order by b.create_date desc`
-	if err := m.db.Sql(sql, userid, models.STATUS_DEL, caseid, models.CONSUME_INNER).Find(&details); err != nil {
+	where c.user_id=? and b.status=? and b.case_id=? and b.pay_type = ? order by b.create_date desc`
+	if err := m.db.Sql(sql, userid, models.STATUS_NORMAL, caseid, models.CONSUME_INNER).Find(&details); err != nil {
 		return nil, err
 	}
 	return details, nil

models/goods/types.go

@@ -46,3 +46,10 @@ type OrdersWithGoods struct {
 	AreaIconWhite       string
 	Goods               []DetailWithType
 }
+
+// OrdersDetail 订单详情
+type OrdersDetail struct {
+	model.TaGoodsOrders `xorm:"extends"`
+	Goods               []DetailWithType            `xorm:"-"`
+	Coupons             []model.TaGoodsOrdersCoupon `xorm:"-"`
+}

models/luckdraw/luckdraw.go

@@ -6,8 +6,10 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"
+	"strings"
 	"time"
 
+	"github.com/astaxie/beego"
 	"github.com/go-xorm/xorm"
 )
 
@@ -29,12 +31,378 @@ func NewDAO(ctx *utils.Context) *LuckDrawDao {
 type LuckDraw struct {
 	model.TaLuckdraw `xorm:"extends"`
 	Prizes           []model.TaLuckdrawPrize
+	Imgs             []model.TaLuckdrawImg
 }
+
 type LuckInfo struct {
 	model.TaLuckdrawRecord `xorm:"extends"`
 	CustomerQrcode         string
 }
 
+// GetLuckDrawTpl 获取抽奖模板
+func (m *LuckDrawDao) GetLuckDrawTpl(orgid string) ([]model.TaLuckdrawTpl, error) {
+	var tpls []model.TaLuckdrawTpl
+	err := m.db.Where("org_id=?", orgid).And("status=?", models.STATUS_NORMAL).Find(&tpls)
+	return tpls, err
+}
+
+// GetLuckDrawList 获取抽奖列表
+func (m *LuckDrawDao) GetLuckDrawList(caseids, name, status string, page, pageSize int) ([]model.TaLuckdraw, error) {
+	var luckdraws []model.TaLuckdraw
+	dao := m.db.Where("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").And("status<>?", models.STATUS_DEL)
+	if name != "" {
+		dao.And("name like '%" + name + "%'")
+	}
+	if status != "" {
+		query := `status=?`
+		switch status {
+		case strconv.Itoa(models.STATUS_NORMAL):
+			query = query + " and end_date>now()"
+			break
+		case strconv.Itoa(models.STATUS_EXPIRE):
+			query = "(" + query + " or end_date<=now())"
+		}
+		dao.And(query, status)
+	}
+	err := dao.Desc("create_date").Limit(pageSize, (page-1)*pageSize).Find(&luckdraws)
+	return luckdraws, err
+}
+
+// GetLuckDrawCount 获取抽奖列表count
+func (m *LuckDrawDao) GetLuckDrawCount(caseids, name, status string) (int, error) {
+	var luckdraws []model.TaLuckdraw
+	dao := m.db.Where("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").And("status<>?", models.STATUS_DEL)
+	if name != "" {
+		dao.And("name like '%" + name + "%'")
+	}
+	if status != "" {
+		dao.And("status=?", status)
+	}
+	err := dao.Find(&luckdraws)
+	return len(luckdraws), err
+}
+
+// RecordWithPhone 抽奖记录
+type RecordWithPhone struct {
+	model.TaLuckdrawRecord `xorm:"extends"`
+	CustomerName           string
+	Phone                  string
+}
+
+// GetLuckDrawRecordCount 获取抽奖记录count
+func (m *LuckDrawDao) GetLuckDrawRecordCount(id, tel string) (int, error) {
+	var records []RecordWithPhone
+	sql := `select a.*,b.customer_name,b.phone from ta_luckdraw_record a inner join ta_customer b on a.user_id=b.customer_id where a.luckdraw_id=?`
+	if tel != "" {
+		sql = sql + ` and b.phone=` + tel
+	}
+
+	err := m.db.Sql(sql, id).Find(&records)
+	return len(records), err
+}
+
+// GetLuckDrawRecord 获取抽奖记录信息
+func (m *LuckDrawDao) GetLuckDrawRecord(id, tel string, page, pageSize int) ([]RecordWithPhone, error) {
+	var records []RecordWithPhone
+	sql := `select a.*,b.customer_name,b.phone from ta_luckdraw_record a inner join ta_customer b on a.user_id=b.customer_id where a.luckdraw_id=?`
+	if tel != "" {
+		sql = sql + ` and b.phone=` + tel
+	}
+	sql = sql + ` ORDER BY a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+
+	err := m.db.Sql(sql, id).Find(&records)
+	return records, err
+}
+
+// GetLuckDrawShareCount 获取分享记录count
+func (m *LuckDrawDao) GetLuckDrawShareCount(id, tel string) (int, error) {
+	var shares []model.TaShareLuckyRecord
+	dao := m.db.Where("luckydraw_id=?", id)
+	if tel != "" {
+		dao.And("from_customer_tel=?", tel)
+	}
+
+	err := dao.Find(&shares)
+	return len(shares), err
+}
+
+// GetLuckDrawShare 获取分享记录信息
+func (m *LuckDrawDao) GetLuckDrawShare(id, tel string, page, pageSize int) ([]model.TaShareLuckyRecord, error) {
+	var shares []model.TaShareLuckyRecord
+	dao := m.db.Where("luckydraw_id=?", id)
+	if tel != "" {
+		dao.And("from_customer_tel=?", tel)
+	}
+
+	err := dao.Desc("create_date").Limit(pageSize, (page-1)*pageSize).Find(&shares)
+	return shares, err
+}
+
+// PrizeWithDefaults 奖品关联内定
+type PrizeWithDefaults struct {
+	model.TaLuckdrawPrize `xorm:"extends"`
+	Defaults              []model.TaPrizeDefault
+}
+
+// LuckDrawInfo 抽奖info
+type LuckDrawInfo struct {
+	model.TaLuckdraw `xorm:"extends"`
+	Prizes           []PrizeWithDefaults
+	Imgs             []model.TaLuckdrawImg
+}
+
+// GetLuckDrawInfoByID 获取抽奖信息
+func (m *LuckDrawDao) GetLuckDrawInfoByID(id string) (*LuckDrawInfo, error) {
+	if id == "" {
+		return nil, errors.New("不存在抽奖信息！")
+	}
+	var luckdraw LuckDrawInfo
+	sql := `select * from ta_luckdraw where id= ?`
+	_, err := m.db.SQL(sql, id).Get(&luckdraw)
+	if err != nil {
+		return nil, err
+	}
+	if luckdraw.Id == "" {
+		return nil, nil
+	}
+	prizes, err := m.GetPrizesWithDefaults(id)
+	if err != nil {
+		utils.LogError("获取奖品信息失败：", err)
+		return nil, errors.New("获取奖品信息失败")
+	}
+	luckdraw.Prizes = prizes
+	imgs, err := m.GetLuckDrawImgs(id)
+	if err != nil {
+		utils.LogError("获取抽奖图片信息失败：", err)
+		return nil, errors.New("获取抽奖图片信息失败")
+	}
+	luckdraw.Imgs = imgs
+	// defaults, err := m.GetLuckDrawDefault(id)
+	// if err != nil {
+	// 	utils.LogError("获取奖品内置信息失败：", err)
+	// 	return nil, errors.New("获取奖品信息失败")
+	// }
+	// luckdraw.Defaults = defaults
+	return &luckdraw, err
+}
+
+// GetLuckDrawImgs 获取抽奖图片
+func (m *LuckDrawDao) GetLuckDrawImgs(luckdrawid string) ([]model.TaLuckdrawImg, error) {
+	var imgs []model.TaLuckdrawImg
+	err := m.db.Where("luckdraw_id=?", luckdrawid).Find(&imgs)
+	return imgs, err
+}
+
+// GetLuckDrawDefault 获取奖品默认信息
+func (m *LuckDrawDao) GetLuckDrawDefault(luckdrawid string) ([]model.TaPrizeDefault, error) {
+	var defaults []model.TaPrizeDefault
+	err := m.db.Where("luckdraw_id=?", luckdrawid).Find(&defaults)
+	return defaults, err
+}
+
+// InsertLuckdraw 新增抽奖信息
+func (m *LuckDrawDao) InsertLuckdraw(luckdraw model.TaLuckdraw) (*model.TaLuckdraw, error) {
+	luckdraw.Id = utils.GetGUID()
+	luckdraw.Status = models.STATUS_NORMAL
+	luckdraw.CreateDate = time.Now()
+
+	_, err := m.db.Insert(luckdraw)
+	return &luckdraw, err
+}
+
+// DelLuckDrawDefault 删除抽奖默认信息
+func (m *LuckDrawDao) DelLuckDrawDefault(luckdrawid string) error {
+	sql := `delete from ta_prize_default where luckdraw_id=?`
+	_, err := m.db.Exec(sql, luckdrawid)
+	return err
+}
+
+// DelLuckDrawImgs 删除抽奖图片信息
+func (m *LuckDrawDao) DelLuckDrawImgs(luckdrawid string) error {
+	sql := `delete from ta_luckdraw_img where luckdraw_id=?`
+	_, err := m.db.Exec(sql, luckdrawid)
+	return err
+}
+
+// DelLuckDrawPrize 删除奖品信息
+func (m *LuckDrawDao) DelLuckDrawPrize(luckdrawid string) error {
+	sql := `delete from ta_prize_detail where prize_id in (select id from ta_luckdraw_prize where luckdraw_id=?)`
+	_, err := m.db.Exec(sql, luckdrawid)
+	if err != nil {
+		return err
+	}
+	sql = `delete from ta_luckdraw_prize where luckdraw_id=?`
+	_, err = m.db.Exec(sql, luckdrawid)
+	return err
+}
+
+// DelLuckDrawSet 删除抽奖设置信息
+func (m *LuckDrawDao) DelLuckDrawSet(luckdrawid string) error {
+	sql := `delete from ta_luckdraw_customer where luckdraw_id=?`
+	_, err := m.db.Exec(sql, luckdrawid)
+	return err
+}
+
+// SaveLuckDrawImgs 保存抽奖图片
+func (m *LuckDrawDao) SaveLuckDrawImgs(imgs []model.TaLuckdrawImg, luckdrawid string) error {
+	for inx, img := range imgs {
+		if img.ImgId == "" {
+			imgs[inx].ImgId = utils.GetGUID()
+			org := m.ctx.Get("org").(model.SysOrg)
+			imgs[inx].OrgId = org.OrgId
+			imgs[inx].Status = models.STATUS_NORMAL
+			imgs[inx].LuckdrawId = luckdrawid
+		}
+	}
+	_, err := m.db.Insert(imgs)
+	return err
+}
+
+// SaveLuckDrawDefault 保存内定信息
+func (m *LuckDrawDao) SaveLuckDrawDefault(defaults []model.TaPrizeDefault, prize model.TaLuckdrawPrize) error {
+	for inx, d := range defaults {
+		if d.DefaultId == "" {
+			defaults[inx].DefaultId = utils.GetGUID()
+			defaults[inx].Status = models.STATUS_NORMAL
+			defaults[inx].CreateDate = time.Now()
+			defaults[inx].LuckdrawId = prize.LuckdrawId
+			defaults[inx].PrizeId = prize.Id
+		}
+	}
+	_, err := m.db.Insert(defaults)
+	return err
+}
+
+// SaveLuckDrawPrizes 保存奖品信息
+func (m *LuckDrawDao) SaveLuckDrawPrizes(prizes []PrizeWithDefaults, luckdraw *model.TaLuckdraw) error {
+	var saveprizes []model.TaLuckdrawPrize
+	for inx, prize := range prizes {
+		if prize.Id == "" {
+			prizes[inx].LuckdrawId = luckdraw.Id
+			prizes[inx].Id = utils.GetGUID()
+		}
+		prizes[inx].Remainder = prize.Stock
+		prizes[inx].Status = models.STATUS_NORMAL
+
+		if prize.PrizeType == models.PRIZE_TYPE_COUPONCARD {
+			valid, err := m.SavePrizeDetail(prizes[inx].TaLuckdrawPrize)
+			if err != nil {
+				return err
+			}
+			prizes[inx].ValidDays = valid.ValidDays
+			prizes[inx].VerificationStart = valid.VerificationStart
+			prizes[inx].VerificationEnd = valid.VerificationEnd
+		}
+		saveprizes = append(saveprizes, prizes[inx].TaLuckdrawPrize)
+		// 保存内定信息
+		if luckdraw.IsInternalDefault == models.BOOL_TRUE {
+			if len(prize.Defaults) > prize.Stock {
+				return errors.New("内置用户不能超过奖品数量！")
+			}
+
+			err := m.SaveLuckDrawDefault(prize.Defaults, prizes[inx].TaLuckdrawPrize)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	_, err := m.db.Insert(saveprizes)
+	if err != nil {
+		return err
+	}
+	return err
+}
+
+// Verification 有效期
+type Verification struct {
+	ValidDays         int
+	VerificationStart time.Time
+	VerificationEnd   time.Time
+}
+
+// SavePrizeDetail 保存奖品明细
+func (m *LuckDrawDao) SavePrizeDetail(prize model.TaLuckdrawPrize) (*Verification, error) {
+	var verification = Verification{}
+	if prize.CouponCardType == models.PRIZE_TYPE_COUPON {
+		var coupon model.TaCoupon
+		_, err := m.db.Where("coupon_id=?", prize.CouponCardId).Get(&coupon)
+		if err != nil {
+			return nil, err
+		}
+		if coupon.UsedCount > 0 {
+			return nil, errors.New("卡券已被使用！不允许保存！")
+		}
+		verification.ValidDays = coupon.ValidDays
+		verification.VerificationStart = coupon.StartDate
+		verification.VerificationEnd = coupon.EndDate
+		var details []model.TaPrizeDetail
+		i := 0
+		for i < coupon.TotalCount {
+			unix := time.Now().UnixNano()
+			random := utils.GetRand(5) + strconv.Itoa(int(unix))
+			url := `/` + prize.CouponCardId + `/` + beego.AppConfig.String("defaultShareUserID") + `/` + prize.CouponCardType + `/` + random + `/receive`
+			var d = model.TaPrizeDetail{
+				Id:      utils.GetGUID(),
+				PrizeId: prize.Id,
+				Url:     url,
+				Status:  models.STATUS_READY,
+			}
+			details = append(details, d)
+			i = i + 1
+		}
+		m.db.Insert(details)
+	} else {
+		var card model.TaCouponCard
+		_, err := m.db.Where("card_id=?", prize.CouponCardId).Get(&card)
+		if err != nil {
+			return nil, err
+		}
+		if card.UsedCount > 0 {
+			return nil, errors.New("卡券已被使用！不允许保存！")
+		}
+		verification.ValidDays = 0
+		verification.VerificationStart = card.StartDate
+		verification.VerificationEnd = card.EndDate
+		var details []model.TaPrizeDetail
+		i := 0
+		for i < card.TotalCount {
+			unix := time.Now().UnixNano()
+			random := utils.GetRand(5) + strconv.Itoa(int(unix))
+			url := `/` + prize.CouponCardId + `/` + beego.AppConfig.String("defaultShareUserID") + `/` + prize.CouponCardType + `/` + random + `/receive`
+			var d = model.TaPrizeDetail{
+				Id:      utils.GetGUID(),
+				PrizeId: prize.Id,
+				Url:     url,
+				Status:  models.STATUS_READY,
+			}
+			details = append(details, d)
+			i = i + 1
+		}
+		m.db.Insert(details)
+	}
+
+	return &verification, nil
+}
+
+// UpdateLuckDraw 修改抽奖
+func (m *LuckDrawDao) UpdateLuckDraw(luckdraw model.TaLuckdraw, cols []string) error {
+	_, err := m.db.Cols(cols...).Where("id=?", luckdraw.Id).Update(luckdraw)
+	return err
+}
+
+// UpdatePrizeDesc 更新奖品描述
+func (m *LuckDrawDao) UpdatePrizeDesc(prizes []PrizeWithDefaults) error {
+	for _, prize := range prizes {
+		_, err := m.db.Cols([]string{
+			"prize_desc",
+		}...).Where("id=?", prize.Id).Update(prize.TaLuckdrawPrize)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 // GetLuckDraw 获取抽奖信息
 func (m *LuckDrawDao) GetLuckDraw(id string) (*LuckDraw, error) {
 	if id == "" {
@@ -51,69 +419,121 @@ func (m *LuckDrawDao) GetLuckDraw(id string) (*LuckDraw, error) {
 		return nil, errors.New("获取奖品信息失败")
 	}
 	luckdraw.Prizes = prizes
+	imgs, err := m.GetLuckDrawImgs(id)
+	if err != nil {
+		utils.LogError("获取抽奖图片信息失败：", err)
+		return nil, errors.New("获取抽奖图片信息失败")
+	}
+	luckdraw.Imgs = imgs
 	return luckdraw, nil
 }
 
+// AddCustomerLuckDraw 保存用户抽奖配置信息
+func (m *LuckDrawDao) AddCustomerLuckDraw(custLuckDraw model.TaLuckdrawCustomer) (*model.TaLuckdrawCustomer, error) {
+	custLuckDraw.LuckdrawCustomerId = utils.GetGUID()
+	custLuckDraw.CreateDate = time.Now()
+	custLuckDraw.ShareNum = 0
+	custLuckDraw.ShareSurplusNum = 0
+	_, err := m.db.Insert(custLuckDraw)
+	return &custLuckDraw, err
+}
+
 // LuckDraw 抽奖
 func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuckdrawPrize, *model.TaPrizeDetail, *model.TaLuckdrawRecord, error) {
 	luckdraw, err := m.GetLuckDrawByID(id)
 	if err != nil {
 		return nil, nil, nil, errors.New("获取抽奖信息失败！")
 	}
-	if luckdraw.Status != models.STATUS_NORMAL {
-		return nil, nil, nil, errors.New("当前抽奖活动状态异常！")
+	if luckdraw.Status == models.STATUS_READY {
+		return nil, nil, nil, errors.New("活动已结束！")
 	}
 	if time.Now().Before(luckdraw.BeginDate) {
 		return nil, nil, nil, errors.New("活动还未开始！")
 	}
-	if time.Now().After(luckdraw.EndDate) {
+	if luckdraw.Status == models.STATUS_EXPIRE || time.Now().After(luckdraw.EndDate) {
 		return nil, nil, nil, errors.New("活动已结束！")
 	}
-	// if user.Phone != "" {
-	// 	sysuser, err := m.GetUserByTel(user.Phone)
-	// 	if err != nil {
-	// 		return nil, nil, errors.New("获取信息失败！")
-	// 	}
-	// 	if sysuser != nil {
-	// 		return nil, nil, errors.New("内部人员不允许进行抽奖！")
-	// 	}
-	// }
-	userluckdraws, err := m.GetUserRecordByLuckDraw(user.CustomerId, id)
-	if err != nil {
-		utils.LogError("获取用户抽奖信息失败:", err)
-		return nil, nil, nil, errors.New("获取用户抽奖信息失败！")
+	if luckdraw.Status != models.STATUS_NORMAL {
+		return nil, nil, nil, errors.New("当前抽奖活动状态异常！")
 	}
-	if len(userluckdraws) > 0 {
-		return nil, nil, nil, errors.New("您已参与过此次抽奖，不允许重复抽奖！")
+	// 系统用户是否可以抽奖
+	if luckdraw.IsSysLuckdraw == models.BOOL_FALSE {
+		if user.Phone != "" {
+			sysuser, err := m.GetUserByTel(user.Phone)
+			if err != nil {
+				return nil, nil, nil, errors.New("获取信息失败！")
+			}
+			if sysuser != nil && sysuser.UserId != "" {
+				return nil, nil, nil, errors.New("内部人员不允许进行抽奖！")
+			}
+		}
 	}
-	prizes, err := m.GetPrizeStock(id)
+
+	// 判断当前用户是否为新用户
+	cstluckdrawSet, err := m.GetCustomerLuckDraw(id, user.CustomerId)
 	if err != nil {
-		utils.LogError("获取奖项失败:", err)
-		return nil, nil, nil, errors.New("获取奖项失败！")
+		utils.LogError("获取用户抽奖配置信息失败:", err)
+		return nil, nil, nil, errors.New("获取用户抽奖配置信息失败！")
+	}
+
+	if luckdraw.JoinType == models.JOINTYPE_NEWUSER {
+		if cstluckdrawSet.IsNew == models.BOOL_FALSE {
+			return nil, nil, nil, errors.New("您不是新用户，不允许抽奖！")
+		}
 	}
-	if len(prizes) == 0 {
-		err = m.UpdateLuckDrawEndDate(luckdraw.Id)
+
+	// 抽奖次数判断
+	if cstluckdrawSet.SurplusNum <= 0 {
+		return nil, nil, nil, errors.New("您的抽奖次数已用完！")
+	} else {
+		// 抽奖次数库存修改
+		err := m.UpdateCstLuckdrawSurplus(cstluckdrawSet)
 		if err != nil {
-			utils.LogError("操作失败，请刷新后重试:", err)
+			utils.LogError("更新抽奖次数库存失败：", err)
 			return nil, nil, nil, errors.New("操作失败，请刷新后重试！")
 		}
-		return nil, nil, nil, errors.New("活动已结束！")
 	}
-	prize, err := m.GetWinning(prizes)
+
+	// 判断是否内置用户
+	defaultPrize, err := m.GetPrizeDefaultByUser(id, user)
 	if err != nil {
-		utils.LogError("获取奖项失败:", err)
-		return nil, nil, nil, errors.New("获取奖项失败！")
+		utils.LogError("操作失败，请刷新后重试:", err)
+		return nil, nil, nil, errors.New("操作失败，请刷新后重试！")
+	}
+	var prize = new(model.TaLuckdrawPrize)
+	if defaultPrize.Id != "" {
+		// 内置用户，直接中奖
+		prize = &defaultPrize.TaLuckdrawPrize
+	} else {
+		prizes, err := m.GetPrizeStock(id)
+		if err != nil {
+			utils.LogError("获取奖项失败:", err)
+			return nil, nil, nil, errors.New("获取奖项失败！")
+		}
+		if len(prizes) == 0 {
+			// err = m.UpdateLuckDrawEndDate(luckdraw.Id)
+			// if err != nil {
+			// 	utils.LogError("操作失败，请刷新后重试:", err)
+			// 	return nil, nil, nil, errors.New("操作失败，请刷新后重试！")
+			// }
+			return nil, nil, nil, errors.New("活动已结束！")
+		}
+		prize, err = m.GetWinning(prizes)
+		if err != nil {
+			utils.LogError("获取奖项失败:", err)
+			return nil, nil, nil, err
+		}
 	}
 
-	// details, err := m.GetPrizeDetail(prize.Id)
-	// if err != nil {
-	// 	utils.LogError("获取奖项详情失败:", err)
-	// 	return nil, nil, errors.New("获取奖项详情失败！")
-	// }
+	details, err := m.GetPrizeDetail(prize.Id)
+	if err != nil {
+		utils.LogError("获取奖项详情失败:", err)
+		return nil, nil, nil, errors.New("获取奖项详情失败！")
+	}
 
 	// 保存中奖记录
 	var record = &model.TaLuckdrawRecord{}
-	// record.Id = utils.GetGUID()
+	record.Id = utils.GetGUID()
 	record.OrgId = luckdraw.OrgId
 	record.CaseId = luckdraw.CaseId
 	record.PrizeId = prize.Id
@@ -122,6 +542,20 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 	record.UserName = user.CustomerName
 	record.UserHeadImg = user.Headimgurl
 	record.LuckdrawId = luckdraw.Id
+	record.IsReality = prize.IsReality
+
+	if prize.IsReality != models.BOOL_FALSE {
+		if prize.ValidDays > 0 {
+			record.VerificationStart = time.Now().Local()
+			record.VerificationEnd = time.Now().Local().AddDate(0, 0, prize.ValidDays)
+		} else {
+			record.VerificationStart = prize.VerificationStart
+			record.VerificationEnd = prize.VerificationEnd
+		}
+	} else {
+		record.VerificationStart = time.Now().Local()
+		record.VerificationEnd = time.Now().Local()
+	}
 
 	utils.LogInfo("生成中奖记录:", *record)
 
@@ -130,32 +564,46 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 		utils.LogError("保存中奖纪录失败：", err)
 		return nil, nil, nil, err
 	}
-	// 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("操作失败！")
-	// 	}
-	// }
+	// 更新参与人数
+	err = m.UpdateLuckDrawJoinedNum(id)
+	if err != nil {
+		utils.LogError("更新参与人数失败：", err)
+		return nil, nil, nil, errors.New("操作失败，请刷新后重试！")
+	}
+
+	// 更新内置信息
+	err = m.UpdatePrizeDefault(defaultPrize.DefaultId, record.Id)
+	if err != nil {
+		utils.LogError("更新内置信息失败：", err)
+		return nil, nil, nil, err
+	}
+
+	var detail = model.TaPrizeDetail{}
+	if len(details) > 0 {
+		// 更新中奖纪录明细
+		details[0].ReceiveId = record.Id
+		err = m.UpdatePrizeDetail(details[0])
+		if err != nil {
+			utils.LogError("更新中奖纪录明细失败:", err)
+			return nil, nil, nil, errors.New("操作失败！")
+		}
+		detail = details[0]
+		// 奖项自动核销，走卡券核销流程
+		err = m.PrizeWriteOff(record.Id, user.CustomerId)
+		if err != nil {
+			utils.LogError("卡券核销失败:", err)
+			return nil, nil, nil, errors.New("操作失败！")
+		}
+	}
 	// 更新库存
 	if prize.IsReality == 1 {
-		prize.Remainder = prize.Remainder - 1
+		// prize.Remainder = prize.Remainder - 1
 		err = m.UpdateStock(prize)
 		if err != nil {
 			utils.LogError("更新库存失败：", err)
 			return nil, nil, nil, err
 		}
-		stockprizes, err := m.GetPrizeStock(id)
+		stockprizes, err := m.GetPrizeStockAll(id)
 		if err != nil {
 			utils.LogError("更新库存失败:", err)
 			return nil, nil, nil, errors.New("操作失败，请刷新后重试！")
@@ -164,9 +612,88 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 			// 更新活动截止时间
 			err = m.UpdateLuckDrawEndDate(luckdraw.Id)
 		}
+	} else {
+		// 奖项自动核销，走卡券核销流程
+		err = m.PrizeWriteOff(record.Id, user.CustomerId)
+		if err != nil {
+			utils.LogError("卡券核销失败:", err)
+			return nil, nil, nil, errors.New("操作失败！")
+		}
 	}
 
-	return prize, nil, record, err
+	return prize, &detail, record, err
+}
+
+// UpdateCstLuckdrawSurplus 更新用户抽奖剩余次数
+func (m *LuckDrawDao) UpdateCstLuckdrawSurplus(cstLuckDraw *model.TaLuckdrawCustomer) error {
+	sql := `update ta_luckdraw_customer set share_surplus_num = (case when surplus_num > share_surplus_num then share_surplus_num else share_surplus_num - 1 end),
+	surplus_num = surplus_num - 1 where luckdraw_customer_id = ? and surplus_num>0`
+	res, err := m.db.Exec(sql, cstLuckDraw.LuckdrawCustomerId)
+	if err != nil {
+		return err
+	}
+	len, _ := res.RowsAffected()
+	if len < 1 {
+		return errors.New("您没有剩余次数！")
+	}
+	return nil
+}
+
+// UpdateLuckDrawJoinedNum 更新抽奖参与人数
+func (m *LuckDrawDao) UpdateLuckDrawJoinedNum(id string) error {
+	var records []model.TaLuckdrawRecord
+	sql := `select DISTINCT user_id from ta_luckdraw_record where luckdraw_id=?`
+	err := m.db.Sql(sql, id).Find(&records)
+	if err != nil {
+		return err
+	}
+	if len(records) > 0 {
+		sql = `update ta_luckdraw set joined_num=? where id=?`
+		_, err = m.db.Exec(sql, len(records), id)
+		return err
+	}
+	return nil
+}
+
+// PrizeWithDefault 默认奖品
+type PrizeWithDefault struct {
+	DefaultId             string
+	model.TaLuckdrawPrize `xorm:"extends"`
+}
+
+// GetPrizeDefaultByUser 获取默认用户
+func (m *LuckDrawDao) GetPrizeDefaultByUser(id string, customer *model.TaCustomer) (*PrizeWithDefault, error) {
+	var prize = PrizeWithDefault{}
+	sql := `select a.default_id,b.* from ta_prize_default a inner join ta_luckdraw_prize b on a.prize_id=b.id where a.luckdraw_id=? and a.tel=? and a.is_receive=?`
+	_, err := m.db.Sql(sql, id, customer.Phone, models.BOOL_FALSE).Get(&prize)
+	return &prize, err
+}
+
+// UpdatePrizeDefault 更新系统内置信息
+func (m *LuckDrawDao) UpdatePrizeDefault(id, recordid string) error {
+	var prizeDefault = model.TaPrizeDefault{
+		DefaultId:   id,
+		ReceiveDate: time.Now(),
+		ReceiveId:   recordid,
+		IsReceive:   models.BOOL_TRUE,
+	}
+	cols := []string{
+		"receive_id",
+		"receive_date",
+		"is_receive",
+	}
+	_, err := m.db.Cols(cols...).Where("default_id=?", prizeDefault.DefaultId).Update(prizeDefault)
+	return err
+}
+
+// GetCustomerLuckDraw 获取用户抽奖设置
+func (m *LuckDrawDao) GetCustomerLuckDraw(luckdrawid, customerid string) (*model.TaLuckdrawCustomer, error) {
+	var customerluckdraw model.TaLuckdrawCustomer
+	_, err := m.db.Where("luckdraw_id=?", luckdrawid).And("customer_id=?", customerid).Get(&customerluckdraw)
+	if err != nil {
+		return nil, err
+	}
+	return &customerluckdraw, nil
 }
 
 // PrizeWriteOff 奖品核销
@@ -196,7 +723,7 @@ func (m *LuckDrawDao) GetWinning(prizes []model.TaLuckdrawPrize) (*model.TaLuckd
 
 	for _, prize := range prizes {
 		// 有剩余的 并且 未过期的
-		if prize.Remainder > 0 && now.Before(prize.VerificationEnd) {
+		if (prize.Remainder > 0 && (now.Before(prize.VerificationEnd) || prize.ValidDays > 0)) || prize.IsReality == models.BOOL_FALSE {
 			p := map[string]interface{}{
 				"prize": prize,
 				"prob":  prize.Probability,
@@ -258,9 +785,11 @@ func (m *LuckDrawDao) UpdateLuckDrawEndDate(id string) error {
 	var luckdraw = model.TaLuckdraw{
 		Id:      id,
 		EndDate: time.Now(),
+		Status:  models.STATUS_EXPIRE,
 	}
 	cols := []string{
 		"end_date",
+		"status",
 	}
 	_, err := m.db.Cols(cols...).Where("id=?", id).Update(luckdraw)
 	return err
@@ -273,17 +802,56 @@ func (m *LuckDrawDao) GetPrizes(luckdrawid string) ([]model.TaLuckdrawPrize, err
 	return prizes, err
 }
 
+// GetPrizesWithDefaults 获取奖品
+func (m *LuckDrawDao) GetPrizesWithDefaults(luckdrawid string) ([]PrizeWithDefaults, error) {
+	var prizes []PrizeWithDefaults
+	sql := `select * from ta_luckdraw_prize where luckdraw_id=? and status=?`
+	err := m.db.Sql(sql, luckdrawid, models.STATUS_NORMAL).Find(&prizes)
+	if err != nil {
+		return nil, err
+	}
+	for inx, prize := range prizes {
+		defaults, err := m.GetDefaultsByPrize(prize.Id)
+		if err != nil {
+			return nil, err
+		}
+		prizes[inx].Defaults = defaults
+	}
+	return prizes, err
+}
+
+// GetDefaultsByPrize 根据奖品获取内定信息
+func (m *LuckDrawDao) GetDefaultsByPrize(prizeid string) ([]model.TaPrizeDefault, error) {
+	var defaults []model.TaPrizeDefault
+	err := m.db.Where("prize_id=?", prizeid).Find(&defaults)
+	return defaults, err
+}
+
 // UpdateStock 修改库存
 func (m *LuckDrawDao) UpdateStock(prize *model.TaLuckdrawPrize) error {
-	cols := []string{
-		"remainder",
-	}
-	_, err := m.db.Cols(cols...).Where("id=?", prize.Id).Update(prize)
+	sql := `update ta_luckdraw_prize set remainder = remainder - 1 where id=?`
+	_, err := m.db.Exec(sql, prize.Id)
+	// cols := []string{
+	// 	"remainder",
+	// }
+	// _, err := m.db.Cols(cols...).Where("id=?", prize.Id).Update(prize)
 	return err
 }
 
 // GetPrizeStock 判断奖项库存
 func (m *LuckDrawDao) GetPrizeStock(luckdrawid string) ([]model.TaLuckdrawPrize, error) {
+	var prizes []model.TaLuckdrawPrize
+	sql := `select a.remainder-(case when b.default_num is null then 0 else b.default_num end) as remainder,
+	a.* from ta_luckdraw_prize a 
+	left join (select prize_id,count(1) as default_num from ta_prize_default where luckdraw_id=? and is_receive=0 group by prize_id) b 
+	on a.id=b.prize_id where a.luckdraw_id=? and a.status=? and (a.remainder-(case when b.default_num is null then 0 else b.default_num end)>0 or is_reality=0)`
+	err := m.db.Sql(sql, luckdrawid, luckdrawid, models.STATUS_NORMAL).Find(&prizes)
+	// err := m.db.Where("luckdraw_id=?", luckdrawid).And("status=?", models.STATUS_NORMAL).And("(remainder>0 or is_reality=0)").Find(&prizes)
+	return prizes, err
+}
+
+// GetPrizeStockAll 获取奖项
+func (m *LuckDrawDao) GetPrizeStockAll(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
@@ -300,7 +868,7 @@ func (m *LuckDrawDao) GetPrizeByID(id string) (model.TaLuckdrawPrize, error) {
 func (m *LuckDrawDao) SaveRecord(record model.TaLuckdrawRecord) (*model.TaLuckdrawRecord, error) {
 	record.CreateDate = time.Now()
 	record.Status = models.STATUS_READY
-	record.Id = utils.GetGUID()
+	// record.Id = utils.GetGUID()
 	_, err := m.db.Insert(&record)
 	return &record, err
 }
@@ -340,7 +908,7 @@ func (m *LuckDrawDao) UpdateRecord(record *LuckInfo) error {
 		"status",
 		"writeoff_date",
 	}
-	_, err := m.db.Cols(cols...).Where("id=?", record.Id).Update(record)
+	_, err := m.db.Cols(cols...).Where("id=?", record.Id).Update(record.TaLuckdrawRecord)
 	return err
 }
 
@@ -360,6 +928,37 @@ func (m *LuckDrawDao) GetUserRecordByLuckDraw(userid string, luckdrawid string)
 	return records, err
 }
 
+// GetUserLuckDrawSet 获取用户抽奖设置
+func (m *LuckDrawDao) GetUserLuckDrawSet(customer model.TaCustomer, luckdrawid string) (*model.TaLuckdrawCustomer, error) {
+	var cstluckdraw = model.TaLuckdrawCustomer{}
+	_, err := m.db.Where("customer_id=?", customer.CustomerId).And("luckdraw_id=?", luckdrawid).Get(&cstluckdraw)
+	if err != nil {
+		return nil, err
+	}
+	if cstluckdraw.CustomerId != "" {
+		return &cstluckdraw, nil
+	}
+	// 插入
+	luckdraw, err := m.GetLuckDrawByID(luckdrawid)
+	if err != nil {
+		return nil, err
+	}
+	surplusNum := luckdraw.LuckdrawNum
+	isnew := 0
+	if customer.Phone == "" {
+		isnew = 1
+	}
+	if luckdraw.JoinType == models.JOINTYPE_NEWUSER && isnew != 1 {
+		surplusNum = 0
+	}
+	cstluckdraw.CustomerId = customer.CustomerId
+	cstluckdraw.IsNew = isnew
+	cstluckdraw.LuckdrawId = luckdrawid
+	cstluckdraw.SurplusNum = surplusNum
+	newinfo, err := m.AddCustomerLuckDraw(cstluckdraw)
+	return newinfo, err
+}
+
 // GetUserLuckDrawByLuckDraw 获取用户的抽奖信息
 func (m *LuckDrawDao) GetUserLuckDrawByLuckDraw(userid string, luckdrawid string) (*model.TaLuckdrawRecord, error) {
 	var records []model.TaLuckdrawRecord
@@ -395,7 +994,7 @@ type UserRecord struct {
 // GetUserLuckDraw 获取用户的抽奖信息
 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)
+	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) + ` order by a.create_date desc`
 	err := m.db.Sql(sql, userid).Find(&records)
 	return records, err
 }
@@ -438,7 +1037,7 @@ func (m *LuckDrawDao) SaveLuckDrawShareData(dt *model.TaShareLuckyRecord) error
 	return nil
 }
 
-// GetLuckDrawShareData 获取用户分享内容
+// GetLuckDrawShareData 获取用户分 享内容
 func (m *LuckDrawDao) GetLuckDrawShareData(from, to, luckID, caseID string) ([]model.TaShareLuckyRecord, error) {
 	var dts []model.TaShareLuckyRecord
 
@@ -453,3 +1052,19 @@ func (m *LuckDrawDao) GetLuckDrawShareData(from, to, luckID, caseID string) ([]m
 
 	return dts, nil
 }
+
+// UpdateShareNum 分享增加抽奖次数
+func (m *LuckDrawDao) UpdateShareNum(luckdraw *LuckDraw, from string) error {
+	num := strconv.Itoa(luckdraw.ShareAddNum)
+	sql := `update ta_luckdraw_customer set share_num=share_num+` + num + `,share_surplus_num = share_surplus_num +` + num + ` ,surplus_num = surplus_num+` + num + ` where luckdraw_id=? and customer_id=?`
+	_, err := m.db.Exec(sql, luckdraw.Id, from)
+	return err
+}
+
+// GetLuckDrawCustomerNum 获取抽奖人数
+func (m *LuckDrawDao) GetLuckDrawCustomerNum(luckdrawid string) (int, error) {
+	var records []model.TaLuckdrawRecord
+	sql := `select DISTINCT user_id from ta_luckdraw_record where luckdraw_id=?`
+	err := m.db.Sql(sql, luckdrawid).Find(&records)
+	return len(records), err
+}

models/luckdrawlist/luckdrawlist.go

@@ -100,8 +100,8 @@ FROM
 	INNER JOIN ta_customer d ON a.user_id = d.customer_id
 	INNER JOIN ta_luckdraw_prize e ON e.id = a.prize_id 
 WHERE
-	 DATE_FORMAT( e.verification_start, '%Y-%m-%d' ) <= DATE_FORMAT( NOW( ), '%Y-%m-%d' )
-	 AND DATE_FORMAT( e.verification_end, '%Y-%m-%d' ) >= DATE_FORMAT( NOW( ), '%Y-%m-%d' )
+	 DATE_FORMAT( a.verification_start, '%Y-%m-%d' ) <= DATE_FORMAT( NOW( ), '%Y-%m-%d' )
+	 AND DATE_FORMAT( a.verification_end, '%Y-%m-%d' ) >= DATE_FORMAT( NOW( ), '%Y-%m-%d' )
 	 AND a.id = '` + luckdrawId + `'
 	 and b.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')`
 	err := m.db.Sql(sql).Find(&luckdraw)

models/marketing/marketing.go

@@ -136,3 +136,14 @@ func (m *MarketingDAO) UpdateMarketing(activity model.SysActivity) error {
 	_, err := m.db.Cols(cols...).Where("action_id=?", activity.ActivityId).Update(activity)
 	return err
 }
+
+func (m *MarketingDAO) GetUserCases(caseid string) ([]model.SysCase, error) {
+	var cases []model.SysCase
+	sql := `SELECT
+	* 
+FROM
+	sys_case 
+WHERE case_id in ('` + strings.Replace(caseid, ",", "','", -1) + `')`
+	err := m.db.Sql(sql).Find(&cases)
+	return cases, err
+}

models/model/sys_activity_action.go

@@ -6,4 +6,5 @@ type SysActivityAction struct {
 	ActiveType   string `xorm:"comment('赠送还是取消赠送之类的') VARCHAR(5)"`
 	ResourceType string `xorm:"VARCHAR(20)"`
 	ResourceDesc string `xorm:"VARCHAR(500)"`
+	ResourceId   string `xorm:"VARCHAR(500)"`
 }

models/model/sys_user.go

@@ -5,16 +5,17 @@ import (
 )
 
 type SysUser struct {
-	UserId     string    `xorm:"not null pk VARCHAR(64)"`
-	UserName   string    `xorm:"not null VARCHAR(50)"`
-	RealName   string    `xorm:"VARCHAR(50)"`
-	Pwd        string    `xorm:"VARCHAR(500)"`
-	OrgId      string    `xorm:"VARCHAR(64)"`
-	Sex        int       `xorm:"SMALLINT(6)"`
-	WorkNo     string    `xorm:"VARCHAR(100)"`
-	Email      string    `xorm:"VARCHAR(100)"`
-	Phone      string    `xorm:"VARCHAR(100)"`
-	Status     int       `xorm:"SMALLINT(6)"`
-	CreateDate time.Time `xorm:"DATETIME"`
-	Headimgurl string    `xorm:"TEXT"`
+	UserId        string    `xorm:"not null pk VARCHAR(64)"`
+	UserName      string    `xorm:"not null VARCHAR(50)"`
+	RealName      string    `xorm:"VARCHAR(50)"`
+	Pwd           string    `xorm:"VARCHAR(500)"`
+	OrgId         string    `xorm:"VARCHAR(64)"`
+	Sex           int       `xorm:"SMALLINT(6)"`
+	WorkNo        string    `xorm:"VARCHAR(100)"`
+	Email         string    `xorm:"VARCHAR(100)"`
+	Phone         string    `xorm:"VARCHAR(100)"`
+	Status        int       `xorm:"SMALLINT(6)"`
+	CreateDate    time.Time `xorm:"DATETIME"`
+	Headimgurl    string    `xorm:"TEXT"`
+	RecommendCode string    `xorm:"VARCHAR(32)"`
 }

models/model/ta_customer_flash_buy.go

@@ -0,0 +1,19 @@
+package model
+
+import (
+	"time"
+)
+
+type TaCustomerFlashBuy struct {
+	CustomerFlashBuyId string    `xorm:"not null pk VARCHAR(64)"`
+	FlashBuyId         string    `xorm:"VARCHAR(64)"`
+	CustomerId         string    `xorm:"VARCHAR(64)"`
+	ValidateStart      time.Time `xorm:"DATETIME"`
+	ValidateEnd        time.Time `xorm:"DATETIME"`
+	CreateDate         time.Time `xorm:"DATETIME"`
+	Status             int       `xorm:"SMALLINT(6)"`
+	VerifyStatus       string    `xorm:"VARCHAR(32)"`
+	VerifyDate         time.Time `xorm:"DATETIME"`
+	CaseId             string    `xorm:"VARCHAR(64)"`
+	OrgId              string    `xorm:"VARCHAR(64)"`
+}

models/model/ta_customer_vip.go

@@ -0,0 +1,24 @@
+package model
+
+import (
+	"time"
+)
+
+type TaCustomerVip struct {
+	CustomerVipId  string    `xorm:"not null VARCHAR(64)"`
+	CustomerId     string    `xorm:"VARCHAR(64)"`
+	VipCardId      string    `xorm:"VARCHAR(64)"`
+	VipCardChildId string    `xorm:"VARCHAR(64)"`
+	CustomerTel    string    `xorm:"VARCHAR(50)"`
+	CreateDate     time.Time `xorm:"DATETIME"`
+	Amount         string    `xorm:"DECIMAL(8,2)"`
+	BeginDate      time.Time `xorm:"DATETIME"`
+	EndDate        time.Time `xorm:"DATETIME"`
+	Balance        string    `xorm:"DECIMAL(8,2)"`
+	PayAmount      string    `xorm:"DECIMAL(8,2)"`
+	CaseId         string    `xorm:"VARCHAR(64)"`
+	OrgId          string    `xorm:"VARCHAR(64)"`
+	Status         int       `xorm:"SMALLINT(6)"`
+	SalesId        string    `xorm:"VARCHAR(64)"`
+	SalesName      string    `xorm:"VARCHAR(50)"`
+}

models/model/ta_customer_vip_change.go

@@ -0,0 +1,22 @@
+package model
+
+import (
+	"time"
+)
+
+type TaCustomerVipChange struct {
+	ChangeId      string    `xorm:"not null VARCHAR(64)"`
+	CustomerVipId string    `xorm:"VARCHAR(64)"`
+	CustomerId    string    `xorm:"VARCHAR(64)"`
+	OrgId         string    `xorm:"VARCHAR(64)"`
+	CaseId        string    `xorm:"VARCHAR(64)"`
+	ChangeType    string    `xorm:"VARCHAR(20)"`
+	ChangeSource  string    `xorm:"VARCHAR(20)"`
+	SourceId      string    `xorm:"VARCHAR(64)"`
+	SourceName    string    `xorm:"VARCHAR(255)"`
+	Amount        string    `xorm:"DECIMAL(8,2)"`
+	FloatType     string    `xorm:"VARCHAR(5)"`
+	CreateDate    time.Time `xorm:"DATETIME"`
+	CreateUser    string    `xorm:"VARCHAR(64)"`
+	Status        int       `xorm:"SMALLINT(6)"`
+}

models/model/ta_flash_buy.go

@@ -0,0 +1,26 @@
+package model
+
+import (
+	"time"
+)
+
+type TaFlashBuy struct {
+	FlashBuyId           string    `xorm:"not null pk VARCHAR(64)"`
+	ModelId              string    `xorm:"VARCHAR(64)"`
+	FlashBuyName         string    `xorm:"VARCHAR(64)"`
+	AttendantType        string    `xorm:"VARCHAR(32)"`
+	FlashBuyMaxAttendant int       `xorm:"INT(11)"`
+	JoinNum              int       `xorm:"INT(11)"`
+	FlashBuyStatus       string    `xorm:"VARCHAR(32)"`
+	StartDate            time.Time `xorm:"DATETIME"`
+	EndDate              time.Time `xorm:"DATETIME"`
+	ValidateType         string    `xorm:"VARCHAR(32)"`
+	ValidateDays         int       `xorm:"INT(11)"`
+	ValidateStart        time.Time `xorm:"DATETIME"`
+	ValidateEnd          time.Time `xorm:"DATETIME"`
+	Status               int       `xorm:"SMALLINT(6)"`
+	FlashBuyInfo         string    `xorm:"TEXT"`
+	CaseId               string    `xorm:"VARCHAR(64)"`
+	OrgId                string    `xorm:"VARCHAR(64)"`
+	CreateDate           time.Time `xorm:"DATETIME"`
+}

models/model/ta_flash_buy_customer.go

@@ -0,0 +1,14 @@
+package model
+
+import (
+	"time"
+)
+
+type TaFlashBuyCustomer struct {
+	FlashBuyCustomerId string    `xorm:"not null VARCHAR(64)"`
+	FlashBuyId         string    `xorm:"VARCHAR(64)"`
+	CustomerId         string    `xorm:"VARCHAR(64)"`
+	IsNew              int       `xorm:"TINYINT(1)"`
+	IsAttend           int       `xorm:"TINYINT(1)"`
+	CreateDate         time.Time `xorm:"DATETIME"`
+}

models/model/ta_luckdraw.go

@@ -5,16 +5,27 @@ import (
 )
 
 type TaLuckdraw struct {
-	Id           string    `xorm:"not null pk VARCHAR(64)"`
-	Name         string    `xorm:"VARCHAR(50)"`
-	ThemeId      string    `xorm:"VARCHAR(64)"`
-	LuckdrawRule string    `xorm:"TEXT"`
-	BeginDate    time.Time `xorm:"DATETIME"`
-	EndDate      time.Time `xorm:"DATETIME"`
-	OrgId        string    `xorm:"VARCHAR(64)"`
-	CaseId       string    `xorm:"VARCHAR(64)"`
-	CreateDate   time.Time `xorm:"DATETIME"`
-	CreateUser   string    `xorm:"VARCHAR(64)"`
-	Remark       string    `xorm:"TEXT"`
-	Status       int       `xorm:"SMALLINT(6)"`
+	Id                string    `xorm:"not null pk VARCHAR(64)"`
+	Name              string    `xorm:"VARCHAR(50)"`
+	ThemeId           string    `xorm:"VARCHAR(64)"`
+	LuckdrawRule      string    `xorm:"TEXT"`
+	BeginDate         time.Time `xorm:"DATETIME"`
+	EndDate           time.Time `xorm:"DATETIME"`
+	OrgId             string    `xorm:"VARCHAR(64)"`
+	CaseId            string    `xorm:"VARCHAR(64)"`
+	CreateDate        time.Time `xorm:"DATETIME"`
+	CreateUser        string    `xorm:"VARCHAR(64)"`
+	Remark            string    `xorm:"TEXT"`
+	Status            int       `xorm:"SMALLINT(6)"`
+	TplId             string    `xorm:"VARCHAR(64)"`
+	JoinedNum         int       `xorm:"default 0 INT(11)"`
+	JoinNum           int       `xorm:"default 0 INT(11)"`
+	JoinType          string    `xorm:"VARCHAR(20)"`
+	NumType           string    `xorm:"VARCHAR(20)"`
+	NumInterval       string    `xorm:"VARCHAR(20)"`
+	LuckdrawNum       int       `xorm:"default 0 INT(11)"`
+	ShareType         string    `xorm:"VARCHAR(20)"`
+	ShareAddNum       int       `xorm:"SMALLINT(6)"`
+	IsSysLuckdraw     int       `xorm:"TINYINT(1)"`
+	IsInternalDefault int       `xorm:"TINYINT(1)"`
 }

models/model/ta_luckdraw_customer.go

@@ -0,0 +1,16 @@
+package model
+
+import (
+	"time"
+)
+
+type TaLuckdrawCustomer struct {
+	LuckdrawCustomerId string    `xorm:"not null VARCHAR(64)"`
+	LuckdrawId         string    `xorm:"VARCHAR(64)"`
+	CustomerId         string    `xorm:"VARCHAR(64)"`
+	IsNew              int       `xorm:"TINYINT(1)"`
+	ShareNum           int       `xorm:"INT(11)"`
+	ShareSurplusNum    int       `xorm:"INT(11)"`
+	SurplusNum         int       `xorm:"INT(11)"`
+	CreateDate         time.Time `xorm:"DATETIME"`
+}

models/model/ta_luckdraw_img.go

@@ -0,0 +1,9 @@
+package model
+
+type TaLuckdrawImg struct {
+	ImgId      string `xorm:"not null VARCHAR(64)"`
+	LuckdrawId string `xorm:"VARCHAR(64)"`
+	ImgUrl     string `xorm:"TEXT"`
+	Status     int    `xorm:"SMALLINT(6)"`
+	OrgId      string `xorm:"VARCHAR(64)"`
+}

models/model/ta_luckdraw_prize.go

@@ -16,6 +16,10 @@ type TaLuckdrawPrize struct {
 	PrizeLink         string    `xorm:"TEXT"`
 	Status            int       `xorm:"SMALLINT(6)"`
 	IsReality         int       `xorm:"SMALLINT(6)"`
+	ValidDays         int       `xorm:"INT(11)"`
 	VerificationStart time.Time `xorm:"DATETIME"`
 	VerificationEnd   time.Time `xorm:"DATETIME"`
+	PrizeType         string    `xorm:"VARCHAR(20)"`
+	CouponCardType    string    `xorm:"VARCHAR(20)"`
+	CouponCardId      string    `xorm:"VARCHAR(64)"`
 }

models/model/ta_luckdraw_record.go

@@ -5,16 +5,22 @@ import (
 )
 
 type TaLuckdrawRecord struct {
-	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)"`
-	UserHeadImg  string    `xorm:"TEXT"`
-	CreateDate   time.Time `xorm:"DATETIME"`
-	Status       int       `xorm:"SMALLINT(6)"`
-	WriteoffDate time.Time `xorm:"DATETIME"`
-	OrgId        string    `xorm:"VARCHAR(64)"`
-	CaseId       string    `xorm:"VARCHAR(64)"`
+	Id                string    `xorm:"not null pk VARCHAR(64)"`
+	LuckdrawId        string    `xorm:"VARCHAR(64)"`
+	PrizeId           string    `xorm:"VARCHAR(64)"`
+	PrizeName         string    `xorm:"VARCHAR(50)"`
+	IsReality         int       `xorm:"SMALLINT(6)"`
+	UserId            string    `xorm:"VARCHAR(64)"`
+	UserName          string    `xorm:"VARCHAR(50)"`
+	UserHeadImg       string    `xorm:"TEXT"`
+	CreateDate        time.Time `xorm:"DATETIME"`
+	Status            int       `xorm:"SMALLINT(6)"`
+	WriteoffDate      time.Time `xorm:"DATETIME"`
+	OrgId             string    `xorm:"VARCHAR(64)"`
+	CaseId            string    `xorm:"VARCHAR(64)"`
+	PrizeType         string    `xorm:"VARCHAR(20)"`
+	CouponCardType    string    `xorm:"VARCHAR(20)"`
+	CouponCardId      string    `xorm:"VARCHAR(64)"`
+	VerificationStart time.Time `xorm:"DATETIME"`
+	VerificationEnd   time.Time `xorm:"DATETIME"`
 }

models/model/ta_luckdraw_tpl.go

@@ -0,0 +1,10 @@
+package model
+
+type TaLuckdrawTpl struct {
+	TplId   string `xorm:"not null VARCHAR(128)"`
+	TplImg  string `xorm:"TEXT"`
+	MiniPic string `xorm:"TEXT"`
+	Status  int    `xorm:"SMALLINT(6)"`
+	OrgId   string `xorm:"VARCHAR(64)"`
+	TplName string `xorm:"VARCHAR(50)"`
+}

models/model/ta_prize_default.go

@@ -0,0 +1,17 @@
+package model
+
+import (
+	"time"
+)
+
+type TaPrizeDefault struct {
+	DefaultId   string    `xorm:"not null VARCHAR(64)"`
+	LuckdrawId  string    `xorm:"VARCHAR(64)"`
+	PrizeId     string    `xorm:"VARCHAR(64)"`
+	Tel         string    `xorm:"VARCHAR(30)"`
+	Status      int       `xorm:"SMALLINT(6)"`
+	CreateDate  time.Time `xorm:"DATETIME"`
+	IsReceive   int       `xorm:"TINYINT(1)"`
+	ReceiveId   string    `xorm:"VARCHAR(64)"`
+	ReceiveDate time.Time `xorm:"DATETIME"`
+}

models/model/ta_sale_customer.go

@@ -0,0 +1,19 @@
+package model
+
+import (
+	"time"
+)
+
+type TaSaleCustomer struct {
+	SaleCustomerId string    `xorm:"not null VARCHAR(64)"`
+	CustomerName   string    `xorm:"VARCHAR(32)"`
+	CustomerPhone  string    `xorm:"VARCHAR(32)"`
+	CustomerId     string    `xorm:"VARCHAR(64)"`
+	SalesPhone     string    `xorm:"VARCHAR(32)"`
+	SalesId        string    `xorm:"VARCHAR(64)"`
+	SalesName      string    `xorm:"VARCHAR(32)"`
+	Status         int       `xorm:"SMALLINT(6)"`
+	CreateDate     time.Time `xorm:"DATETIME"`
+	CaseId         string    `xorm:"VARCHAR(64)"`
+	OrgId          string    `xorm:"VARCHAR(64)"`
+}

models/model/ta_sale_customer_remark.go

@@ -0,0 +1,16 @@
+package model
+
+import (
+	"time"
+)
+
+type TaSaleCustomerRemark struct {
+	SalesCustomerRemarkId string    `xorm:"not null VARCHAR(64)"`
+	SaleCustomerId        string    `xorm:"VARCHAR(64)"`
+	CustomerId            string    `xorm:"VARCHAR(64)"`
+	SalesId               string    `xorm:"VARCHAR(64)"`
+	RemarkTitle           string    `xorm:"VARCHAR(256)"`
+	Remark                string    `xorm:"TEXT"`
+	CreateDate            time.Time `xorm:"DATETIME"`
+	Status                int       `xorm:"SMALLINT(6)"`
+}

models/model/ta_vip_card.go

@@ -13,4 +13,6 @@ type TaVipCard struct {
 	Status      int       `xorm:"SMALLINT(6)"`
 	CaseId      string    `xorm:"VARCHAR(64)"`
 	OrgId       string    `xorm:"VARCHAR(64)"`
+	BeginDate   time.Time `xorm:"DATETIME"`
+	EndDate     time.Time `xorm:"DATETIME"`
 }

models/model/ta_vip_card_child.go

@@ -16,4 +16,8 @@ type TaVipCardChild struct {
 	Amount           string    `xorm:"DECIMAL(8,2)"`
 	SalesId          string    `xorm:"VARCHAR(64)"`
 	SalesName        string    `xorm:"VARCHAR(50)"`
+	BeginDate        time.Time `xorm:"DATETIME"`
+	EndDate          time.Time `xorm:"DATETIME"`
+	CaseId           string    `xorm:"VARCHAR(64)"`
+	OrgId            string    `xorm:"VARCHAR(64)"`
 }

models/model/td_flashbuy_model.go

@@ -0,0 +1,10 @@
+package model
+
+type TdFlashbuyModel struct {
+	ModelId          string `xorm:"not null pk VARCHAR(64)"`
+	ModelName        string `xorm:"VARCHAR(64)"`
+	OrgId            string `xorm:"VARCHAR(64)"`
+	Status           int    `xorm:"SMALLINT(6)"`
+	ModelImgUrl      string `xorm:"TEXT"`
+	ModelLargeImgUrl string `xorm:"TEXT"`
+}

models/models.go

@@ -1,6 +1,8 @@
 package models
 
 import (
+	"spaceofcheng/services/utils"
+
 	"github.com/astaxie/beego/config"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/go-xorm/xorm"
@@ -10,7 +12,7 @@ var (
 	DBEngine *xorm.Engine
 )
 
-func init() {
+func InitDB() {
 	DBEngine = NewDBEngine()
 }
 
@@ -29,8 +31,9 @@ func NewDBEngine() *xorm.Engine {
 	return engine
 }
 
-func getMySQLDNS() string {
-	dbconf, _ := config.NewConfig("ini", "conf/db.conf")
+func getMySQLDNS() (dns string) {
+	appRoot := utils.GetAppRoot()
+	dbconf, _ := config.NewConfig("ini", appRoot+"/conf/db.conf")
 
 	conProt := dbconf.DefaultString("con_protocol", "tcp")
 	dbAddr := dbconf.DefaultString("db_addr", "localhost")
@@ -40,7 +43,7 @@ func getMySQLDNS() string {
 	database := dbconf.String("database")
 	charSet := dbconf.DefaultString("char_set", "utf8")
 
-	dns := userName
+	dns = userName
 
 	if len(password) > 0 {
 		dns += ":" + password
@@ -48,5 +51,5 @@ func getMySQLDNS() string {
 
 	dns += "@" + conProt + "(" + dbAddr + ":" + dbPort + ")" + "/" + database + "?charset=" + charSet
 
-	return dns
+	return
 }

models/statistics/cardcoupon.go

@@ -225,8 +225,8 @@ func (m *StatisticsDAO) CardCouponUsedStatistics(caseids, tel, name, receivetype
 							a.start_date,
 							a.end_date,
 							a.receive_date,
-							a.receive_date as used_date,
-							'used' as verify_status
+							a.verify_date as used_date,
+							a.verify_status
 						FROM
 							ta_customer_card a
 						INNER JOIN ta_coupon_card_target b ON b.card_id = a.card_id
@@ -265,7 +265,7 @@ func (m *StatisticsDAO) CardCouponUsedStatistics(caseids, tel, name, receivetype
 									) as used_date,
 									(
 										CASE
-										WHEN NOW() > a.end_date THEN
+										WHEN use_date IS NULL and NOW() > a.end_date THEN
 											'expire'
 										WHEN use_date IS NULL THEN
 											'useable'
@@ -278,8 +278,8 @@ func (m *StatisticsDAO) CardCouponUsedStatistics(caseids, tel, name, receivetype
 								INNER JOIN sys_case b ON a.case_id = b.case_id
 								INNER JOIN ta_customer cst ON a.customer_id = cst.customer_id
 								INNER JOIN ta_coupon cp ON a.coupon_id = cp.coupon_id
-								LEFT JOIN ta_goods_orders_coupon c ON a.coupon_id = c.coupon_id
-								LEFT JOIN ta_course_orders_coupon d ON a.coupon_id = d.coupon_id
+								LEFT JOIN ta_goods_orders_coupon c ON a.customer_coupon_id = c.customer_coupon_id
+								LEFT JOIN ta_course_orders_coupon d ON a.customer_coupon_id = d.customer_coupon_id
 								WHERE b.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')`
 
 	sql := "select * from (" + cardsql + " union " + couponsql + ") tab where (1=1)"
@@ -325,7 +325,7 @@ func (m *StatisticsDAO) CardCouponUsedCountStatistics(caseids, tel, name, receiv
 							a.start_date,
 							a.end_date,
 							a.receive_date,
-							a.receive_date as used_date,
+							a.verify_date as used_date,
 							a.verify_status
 						FROM
 							ta_customer_card a
@@ -365,7 +365,7 @@ func (m *StatisticsDAO) CardCouponUsedCountStatistics(caseids, tel, name, receiv
 									) as used_date,
 									(
 										CASE
-										WHEN NOW() > a.end_date THEN
+										WHEN use_date IS NULL and NOW() > a.end_date THEN
 											'expire'
 										WHEN use_date IS NULL THEN
 											'useable'
@@ -378,8 +378,8 @@ func (m *StatisticsDAO) CardCouponUsedCountStatistics(caseids, tel, name, receiv
 								INNER JOIN sys_case b ON a.case_id = b.case_id
 								INNER JOIN ta_customer cst ON a.customer_id = cst.customer_id
 								INNER JOIN ta_coupon cp ON a.coupon_id = cp.coupon_id
-								LEFT JOIN ta_goods_orders_coupon c ON a.coupon_id = c.coupon_id
-								LEFT JOIN ta_course_orders_coupon d ON a.coupon_id = d.coupon_id
+								LEFT JOIN ta_goods_orders_coupon c ON a.customer_coupon_id = c.customer_coupon_id
+								LEFT JOIN ta_course_orders_coupon d ON a.customer_coupon_id = d.customer_coupon_id
 								WHERE b.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')`
 
 	sql := "select * from (" + cardsql + " union " + couponsql + ") tab where (1=1)"

models/statistics/goods.go

@@ -161,7 +161,8 @@ func (m *StatisticsDAO) GetGoodsOrderStatistics(status, usertype, caseids, begin
 					INNER JOIN sys_case d ON a.case_id = d.case_id
 					LEFT JOIN sys_user c ON b.user_id = c.user_id
 					LEFT JOIN sys_case_area e ON a.area_id =e.area_id
-					where d.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')`
+					where d.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')
+					and a.status > 0`
 
 	if usertype != "" {
 		sql = sql + ` and a.user_type='` + usertype + `'`

models/sys.go

@@ -270,3 +270,19 @@ func GetAllCases() ([]model.SysCase, error) {
 	err := DBEngine.Where("status=?", STATUS_NORMAL).Asc("org_id").Find(&cases)
 	return cases, err
 }
+
+// GetCaseByID 获取案场
+func GetCaseByID(caseID string) (cs *model.SysCase, err error) {
+	cs = new(model.SysCase)
+
+	_, err = DBEngine.Where("case_id=?", caseID).Get(cs)
+	return cs, err
+}
+
+// GetAllOrgs 获取所有机构
+func GetAllOrgs() ([]model.SysOrg, error) {
+	var orgs []model.SysOrg
+	err := DBEngine.Where("status=?", STATUS_NORMAL).Asc("org_id").Find(&orgs)
+
+	return orgs, err
+}

models/system/user.go

@@ -2,6 +2,7 @@ package system
 
 import (
 	"errors"
+	"math/rand"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
@@ -31,23 +32,30 @@ func NewUserDAO(ctx *utils.Context) *UserDAO {
 type UserListInfo struct {
 	model.SysUser `xorm:"extends"`
 	UserTypeNames string
+	CaseName      string
+}
+type CustomerInfo struct {
+	model.TaCustomer `xorm:"extends"`
+	Remark           string
 }
 
 // GetUserList 用户列表
 func (m *UserDAO) GetUserList(username, typeid, caseids string, page int, pageSize int) ([]UserListInfo, error) {
 	var users []UserListInfo
-	sql := `select user.*,c.user_type_names from sys_user user left join (
+	sql := `select user.*,c.user_type_names,d.case_name from sys_user user left join (
 		select a.user_id,GROUP_CONCAT(b.type_name) as user_type_names from sys_user_type a
 		INNER join td_user_type b on a.type_id = b.type_id
-		group by a.user_id) c on user.user_id = c.user_id where user.user_id != '` + models.ADMIN_ID + `' and
-		(status> ` + strconv.Itoa(models.STATUS_DEL) + ` and user_name like '%` + username + `%' and user.user_id in 
+		group by a.user_id) c on user.user_id = c.user_id
+		LEFT JOIN sys_user_case d on user.user_id=d.user_id and d.is_belong = 1
+		where user.user_id != '` + models.ADMIN_ID + `' and
+		(user.status> ` + strconv.Itoa(models.STATUS_DEL) + ` and user.user_name like '%` + username + `%' and user.user_id in 
 		(select user_id from sys_user_case where is_belong=1 and case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
 
 	if typeid != "" {
 		sql = sql + " and user.user_id in (select user_id from sys_user_type where type_id = '" + typeid + "')"
 	}
 
-	sql = sql + " order by create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
+	sql = sql + " order by user.create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&users)
 	return users, err
 }
@@ -171,6 +179,27 @@ func (m *UserDAO) AddUser(user model.SysUser) (*model.SysUser, error) {
 	return &user, err
 }
 
+func (m *UserDAO) GenerateRecommendCode() string {
+	var temp1 int = rand.Intn(9) * 87
+	var temp2 int = rand.Intn(9)
+	var temp3 int = rand.Intn(9) * 7
+	var code string = strconv.Itoa(temp1) + strconv.Itoa(temp2)
+	if len(code) < 4 {
+		code += strconv.Itoa(temp3)
+	}
+	if len(code) > 4 {
+		code = code[0:4]
+	}
+	return code
+}
+func (m *UserDAO) IsCodeExist(code string) (int, error) {
+	var user []model.SysUser
+	sql := `select * from sys_user where recommend_code = '` + code + `'`
+	err := m.db.Sql(sql).Find(&user)
+	return len(user), err
+
+}
+
 // UpdateUser 修改用户
 func (m *UserDAO) UpdateUser(user model.SysUser) error {
 	var col = []string{
@@ -389,11 +418,12 @@ func (m *UserDAO) UpdateCustomerHeadImg(customerid, username, imgurl string) err
 }
 
 // GetUserCustomer 获取我的推荐客户
-func (m *UserDAO) GetUserCustomer(userid, isrecommend, key string, page int, pageSize int) ([]model.TaCustomer, error) {
-	var customers []model.TaCustomer
-	sql := `select * from ta_customer where (recommend_id='` + userid + `'`
+func (m *UserDAO) GetUserCustomer(userid, isrecommend, key string, page int, pageSize int) ([]CustomerInfo, error) {
+	var customers []CustomerInfo
+	sql := `select a.*,
+	( SELECT remark FROM ta_sale_customer_remark b WHERE a.customer_id = b.customer_id ORDER BY b.create_date DESC LIMIT 1 ) AS remark from ta_customer a where (a.recommend_id='` + userid + `'`
 	if isrecommend == "" || isrecommend == "false" {
-		sql += ` or customer_id in (
+		sql += ` or a.customer_id in (
 			select customer_id from ta_customer_coupon where sales_id='` + userid + `'
 			union 
 			select customer_id from ta_customer_card where sales_id='` + userid + `'
@@ -401,10 +431,10 @@ func (m *UserDAO) GetUserCustomer(userid, isrecommend, key string, page int, pag
 	}
 	sql += ")"
 	if key != "" {
-		sql += ` and (customer_name like '%` + key + `%' or phone like '%` + key + `%' or name like '%` + key + `%')`
+		sql += ` and (a.customer_name like '%` + key + `%' or a.phone like '%` + key + `%' or a.name like '%` + key + `%')`
 	}
 	offset := (page - 1) * pageSize
-	sql += ` order by create_date desc LIMIT ` + strconv.Itoa(pageSize) + ` OFFSET ` + strconv.Itoa(offset)
+	sql += ` order by a.create_date desc LIMIT ` + strconv.Itoa(pageSize) + ` OFFSET ` + strconv.Itoa(offset)
 	err := m.db.Sql(sql).Find(&customers)
 	return customers, err
 }

models/vipcard/vipcard.go

@@ -53,7 +53,7 @@ WHERE
 	}
 
 	if sellerName != "" {
-		sql = sql + ` and tc.recommend_name like '%` + sellerName + `%'`
+		sql = sql + ` and vcc.sales_name like '%` + sellerName + `%'`
 	}
 
 	if userName != "" {
@@ -83,7 +83,7 @@ WHERE
 	}
 
 	if sellerName != "" {
-		sql = sql + ` and tc.recommend_name like '%` + sellerName + `%'`
+		sql = sql + ` and vcc.sales_name like '%` + sellerName + `%'`
 	}
 
 	if userName != "" {
@@ -199,3 +199,44 @@ WHERE
 	err := m.db.Sql(sql).Find(&vipcards)
 	return vipcards, err
 }
+
+// AddCustomerVip 保存客户Vip卡信息
+func (m *VipcardDAO) AddCustomerVip(customerVip model.TaCustomerVip) (*model.TaCustomerVip, error) {
+	customerVip.CreateDate = time.Now()
+	customerVip.CustomerVipId = utils.GetGUID()
+	customerVip.Status = models.STATUS_NORMAL
+	_, err := m.db.Insert(customerVip)
+	return &customerVip, err
+}
+
+// InsertCustomerVipChange 保存客户Vip卡变动
+func (m *VipcardDAO) InsertCustomerVipChange(change model.TaCustomerVipChange) error {
+	change.ChangeId = utils.GetGUID()
+	change.Status = models.STATUS_NORMAL
+	change.CreateDate = time.Now()
+
+	_, err := m.db.Insert(change)
+	return err
+}
+
+// CustomerVipWithChange 用户vip卡关联变更
+type CustomerVipWithChange struct {
+	model.TaCustomerVip `xorm:"extends"`
+	Changes             []model.TaCustomerVipChange
+}
+
+// GetCustomerVips 获取客户vip卡信息
+func (m *VipcardDAO) GetCustomerVips(customerid string) ([]CustomerVipWithChange, error) {
+	var vips []CustomerVipWithChange
+	sql := `select * from ta_customer_vip where customer_id=? and status>?`
+	err := m.db.Sql(sql, customerid, models.STATUS_DEL).Find(&vips)
+	if err != nil {
+		return nil, err
+	}
+	for inx, vip := range vips {
+		var changes []model.TaCustomerVipChange
+		m.db.Where("customer_vip_id=?", vip.CustomerVipId).And("status>?", models.STATUS_DEL).Find(&changes)
+		vips[inx].Changes = changes
+	}
+	return vips, nil
+}

routers/common.go

@@ -9,8 +9,10 @@ import (
 	"spaceofcheng/services/controllers/coupon"
 	"spaceofcheng/services/controllers/course"
 	"spaceofcheng/services/controllers/customer"
+	"spaceofcheng/services/controllers/flashbuy"
 	"spaceofcheng/services/controllers/goods"
 	"spaceofcheng/services/controllers/gymcard"
+	"spaceofcheng/services/controllers/luckdraw"
 	"spaceofcheng/services/controllers/luckdrawlist"
 	"spaceofcheng/services/controllers/marketing"
 	"spaceofcheng/services/controllers/message"
@@ -23,9 +25,7 @@ import (
 	"github.com/astaxie/beego"
 )
 
-func getCommonRoutes() beego.LinkNamespace {
-	prefix := beego.AppConfig.String("api::common")
-
+func getCommonRoutes(prefix string) beego.LinkNamespace {
 	return beego.NSNamespace(prefix,
 		// 商品分类
 		beego.NSRouter("/type/goods", &goods.GoodsController{}, "get:GetGoodsType"),
@@ -197,6 +197,19 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("luckdrawlist/verify/:luckdrawId", &luckdrawlist.LuckdrawlistController{}, "get:GetVerifyList"),
 		beego.NSRouter("luckdrawlist/verify/:luckdrawId", &luckdrawlist.LuckdrawlistController{}, "put:VerifyLuckdraw"),
 
+		beego.NSRouter("luckdrawtpl", &luckdraw.LuckDrawController{}, "get:GetLuckDrawTpl"),
+		beego.NSRouter("luckdraw", &luckdraw.LuckDrawController{}, "get:GetLuckDrawList"),
+		beego.NSRouter("luckdraw/:luckdrawid", &luckdraw.LuckDrawController{}, "get:GetLuckDrawByID"),
+		beego.NSRouter("luckdraw", &luckdraw.LuckDrawController{}, "post:SaveLuckDraw"),
+		beego.NSRouter("luckdraw/:luckdrawid", &luckdraw.LuckDrawController{}, "put:SaveLuckDraw"),
+		beego.NSRouter("luckdraw/:luckdrawid", &luckdraw.LuckDrawController{}, "delete:DelLuckDraw"),
+
+		beego.NSRouter("luckdraw/:luckdrawid/open", &luckdraw.LuckDrawController{}, "put:OpenLuckDraw"),
+		beego.NSRouter("luckdraw/:luckdrawid/stop", &luckdraw.LuckDrawController{}, "put:StopLuckDraw"),
+
+		beego.NSRouter("luckdraw/records/:luckdrawid", &luckdraw.LuckDrawController{}, "get:GetLuckDrawRecordList"),
+		beego.NSRouter("luckdraw/share/:luckdrawid", &luckdraw.LuckDrawController{}, "get:GetLuckDrawShareList"),
+
 		// bodychecklist 体检列表
 		beego.NSRouter("bodychecklist", &bodychecklist.BodychecklistController{}, "get:GetBodyCheckList"),
 		// role 角色
@@ -256,6 +269,7 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/coupon/:id", &coupon.CouponController{}, "put:UpdateCoupon"),
 		beego.NSRouter("/coupon/:id/to/:users", &coupon.CouponController{}, "post:GiveCoupon"),
 		beego.NSRouter("/coupon/type/:type", &coupon.CouponController{}, "get:GetCouponBySendType"),
+		beego.NSRouter("/coupon/sys/:caseId", &coupon.CouponController{}, "get:GetSysCouponByCase"),
 
 		// 签到
 		beego.NSRouter("/case/signin", &cases.SigninController{}, "get:GetSigninWhere"),
@@ -267,11 +281,13 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/card/:id", &card.CardController{}, "get:GetCardByIDForAdmin"),
 		beego.NSRouter("/card/:id", &card.CardController{}, "put:UpdateCard"),
 		beego.NSRouter("/card/:id/to/:users", &card.CardController{}, "post:GiveCard"),
+		beego.NSRouter("/card/sys/:caseId", &card.CardController{}, "get:GetSysCardList"),
 		// 赠送记录
 		beego.NSRouter("/record", &card.RecordController{}, "get:GetRecordList"),
 
 		// 文件
 		beego.NSRouter("/file", &controllers.BaseController{}, "post:FileUpload"),
+		beego.NSRouter("/file/base64", &controllers.BaseController{}, "post:UploadBase64Image"),
 
 		// 会员
 		beego.NSRouter("/customer", &customer.CustomerController{}, "get:CustWXList"),
@@ -288,6 +304,7 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/marketing/normal/:activityId", &marketing.MarketingController{}, "put:SetMarketingNormal"),
 		beego.NSRouter("/marketing/disable/:activityId", &marketing.MarketingController{}, "put:SetMarketingDisable"),
 		beego.NSRouter("/marketing/:activityId", &marketing.MarketingController{}, "delete:DelMarketing"),
+		beego.NSRouter("/marketing/case", &marketing.MarketingController{}, "get:GetUserCases"),
 
 		// websocket
 		beego.NSRouter("/websocket/:grps/:id", &controllers.BaseController{}, "get:Ws"),
@@ -307,5 +324,17 @@ func getCommonRoutes() beego.LinkNamespace {
 		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"),
+
+		// flashbuy 抢购
+		beego.NSRouter("/flashbuy", &flashbuy.FlashBuyController{}, "get:GetFlashBuyList"),
+		beego.NSRouter("/flashbuy/customer/:flashBuyId", &flashbuy.FlashBuyController{}, "get:GetCustomerFlashBuyList"),
+		beego.NSRouter("/flashbuy/:flashBuyId", &flashbuy.FlashBuyController{}, "get:GetFlashBuyById"),
+		beego.NSRouter("/flashbuy", &flashbuy.FlashBuyController{}, "post:SaveFlashBuy"),
+		beego.NSRouter("/flashbuy/edit", &flashbuy.FlashBuyController{}, "put:SaveFlashBuy"),
+		beego.NSRouter("/flashbuy/:flashBuyId", &flashbuy.FlashBuyController{}, "delete:DeleteFlashBuy"),
+		beego.NSRouter("/flashbuy/:flashBuyId/:flashBuyStatus", &flashbuy.FlashBuyController{}, "put:UpdateFlashBuy"),
+		beego.NSRouter("/flashbuy/verify/:qrcode/:caseId", &flashbuy.FlashBuyController{}, "get:VerifyCustomerFlashBuyList"),
+		beego.NSRouter("/flashbuy/verify/:customerFlashBuyId", &flashbuy.FlashBuyController{}, "put:Verify"),
+		beego.NSRouter("/flashbuy/model", &flashbuy.FlashBuyController{}, "get:GetFlashModelList"),
 	)
 }

routers/guest.go

@@ -6,6 +6,7 @@ import (
 	"spaceofcheng/services/controllers/cases"
 	"spaceofcheng/services/controllers/course"
 	"spaceofcheng/services/controllers/customer"
+	"spaceofcheng/services/controllers/customerremark"
 	"spaceofcheng/services/controllers/goods"
 	"spaceofcheng/services/controllers/message"
 	"spaceofcheng/services/controllers/user"
@@ -13,9 +14,7 @@ import (
 	"github.com/astaxie/beego"
 )
 
-func getGuestRoutes() beego.LinkNamespace {
-	prefix := beego.AppConfig.String("api::guest")
-
+func getGuestRoutes(prefix string) beego.LinkNamespace {
 	return beego.NSNamespace(prefix,
 		// cms
 		beego.NSRouter("/cms/info", &message.MessageController{}, "get:GetCmsInfoByLocation"),
@@ -68,5 +67,7 @@ func getGuestRoutes() beego.LinkNamespace {
 		beego.NSRouter("/case/checkin", &cases.SigninController{}, "post:AddSignin"),
 		beego.NSRouter("/wechat", &controllers.WechatController{}, "get,post:WechatInfo"),
 		// beego.NSRouter("/wechat", &controllers.WechatController{}, "post:WxReceive"),
+
+		beego.NSRouter("/customerremark/:recommendCode", &customerremark.CustomerRemarkController{}, "get:IsExist"),
 	)
 }

routers/router.go

@@ -9,25 +9,36 @@ package routers
 
 import (
 	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/utils"
 
 	"github.com/astaxie/beego"
 )
 
-func init() {
-	prefix := beego.AppConfig.String("api::prefix")
+func RouteInit() {
+	appRoot := utils.GetAppRoot()
+
+	appConf, _ := utils.GetConfiger(appRoot + "/conf/app.conf")
+	if appConf == nil {
+		return
+	}
+
+	prefix := appConf.String("api::prefix")
+	guestPrefix := appConf.String("api::guest")
+	commonPrefix := appConf.String("api::common")
+	wechatPrefix := appConf.String("api::wechat")
 
 	ns := beego.NewNamespace(prefix,
 		// 解决跨域时 先发送 options 问题
 		beego.NSRouter("*", &controllers.BaseController{}, "options:Options"),
 
 		// 通用需要鉴权路由
-		getCommonRoutes(),
+		getCommonRoutes(commonPrefix),
 
 		// 微信路由
-		getWechatRoutes(),
+		getWechatRoutes(wechatPrefix),
 
 		// 不需要鉴权的路由
-		getGuestRoutes(),
+		getGuestRoutes(guestPrefix),
 	)
 
 	beego.AddNamespace(ns)

routers/wechat.go

@@ -7,17 +7,18 @@ import (
 	"spaceofcheng/services/controllers/coupon"
 	"spaceofcheng/services/controllers/course"
 	"spaceofcheng/services/controllers/customer"
+	"spaceofcheng/services/controllers/customerremark"
+	"spaceofcheng/services/controllers/flashbuy"
 	"spaceofcheng/services/controllers/goods"
 	"spaceofcheng/services/controllers/gymcard"
 	"spaceofcheng/services/controllers/luckdraw"
 	"spaceofcheng/services/controllers/user"
+	"spaceofcheng/services/controllers/vipcard"
 
 	"github.com/astaxie/beego"
 )
 
-func getWechatRoutes() beego.LinkNamespace {
-	prefix := beego.AppConfig.String("api::wechat")
-
+func getWechatRoutes(prefix string) beego.LinkNamespace {
 	return beego.NSNamespace(prefix,
 		// 会员
 		beego.NSRouter("/customer", &customer.CustomerController{}, "get:GetCustWXByID"),
@@ -33,7 +34,9 @@ func getWechatRoutes() beego.LinkNamespace {
 
 		// 下单
 		beego.NSRouter("/order/goods", &goods.GoodsController{}, "post:PostOrder"),
+		beego.NSRouter("/order/goods/:ordersid", &goods.GoodsController{}, "put:ConfirmOrders"),
 		beego.NSRouter("/order/course", &course.CourseController{}, "post:PostOrder"),
+		beego.NSRouter("/order/course/:ordersid", &course.CourseController{}, "put:ConfirmOrders"),
 
 		// 课程
 		beego.NSRouter("/course/user", &course.CourseController{}, "get:GetCustomerCourse"),
@@ -59,6 +62,7 @@ func getWechatRoutes() beego.LinkNamespace {
 		// 用户
 		beego.NSRouter("/user/:type", &user.UserController{}, "get:GetCaseUserByType"),
 		beego.NSRouter("/user/detail/:id", &user.UserController{}, "get:GetCaseUserByID"),
+		beego.NSRouter("/user/code", &user.UserController{}, "get:GetMyRecommendCode"),
 
 		// 优惠券
 		beego.NSRouter("/coupon", &coupon.CouponController{}, "get:GetCaseUsableCoupon"),
@@ -74,6 +78,9 @@ func getWechatRoutes() beego.LinkNamespace {
 		beego.NSRouter("/card/:id", &card.CardController{}, "post:ReceiveCard"),
 		beego.NSRouter("/channel/card/:id", &card.CardController{}, "post:ChannelReceiveCard"),
 
+		// vip卡
+		beego.NSRouter("/vip", &vipcard.VipcardController{}, "get:GetCustomerVips"),
+
 		// 体检
 		beego.NSRouter("/GetCheckByUser", &bodycheck.BodyCheckController{}, "get:GetCheckByUser"),
 
@@ -88,5 +95,20 @@ func getWechatRoutes() beego.LinkNamespace {
 		beego.NSRouter("/luckdraw/record", &luckdraw.LuckDrawController{}, "get:GetRecordByLuckDraw"),
 		beego.NSRouter("/user/luckdraw/record", &luckdraw.LuckDrawController{}, "get:GetUserLuckDraw"),
 		beego.NSRouter("/user/luckdraw/record/:id", &luckdraw.LuckDrawController{}, "get:GetRecordByID"),
+
+		// 抢购
+		beego.NSRouter("/flashbuy/flash/:flashBuyId", &flashbuy.FlashBuyController{}, "get:GetWechatFlashBuyById"),
+		beego.NSRouter("/flashbuy/customer", &flashbuy.FlashBuyController{}, "get:GetCustomerFlashBuyByCustomerId"),
+		beego.NSRouter("/flashbuy/customerFlash/:customerFlashBuyId", &flashbuy.FlashBuyController{}, "get:GetCustomerFlashBuyId"),
+		beego.NSRouter("/flashbuy/:id", &flashbuy.FlashBuyController{}, "post:FlashBuy"),
+		beego.NSRouter("/flashbuy/customer/:flashBuyId", &flashbuy.FlashBuyController{}, "post:AddNewFlashBuyCustomer"),
+		beego.NSRouter("/flashbuy/customer/:flashBuyId", &flashbuy.FlashBuyController{}, "put:UpdateFlashBuyCustomer"),
+		beego.NSRouter("/flashbuy/newcustomer", &flashbuy.FlashBuyController{}, "get:IsNewCustomer"),
+
+		// 客户备注
+		beego.NSRouter("/customerremark/record/:salesId/:customerId", &customerremark.CustomerRemarkController{}, "get:GetCustomerReceiveRecord"),
+		beego.NSRouter("/customerremark/:salesId/:customerId", &customerremark.CustomerRemarkController{}, "get:GetCustomerRemarkList"),
+		beego.NSRouter("/customerremark/search/:salesId/:customerInfo", &customerremark.CustomerRemarkController{}, "get:SearchCustomer"),
+		beego.NSRouter("/customerremark", &customerremark.CustomerRemarkController{}, "post:AddRemark"),
 	)
 }

service/card/card.go

@@ -11,9 +11,11 @@ import (
 	"spaceofcheng/services/models/system"
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
+	"strconv"
 	"strings"
 	"time"
 
+	"github.com/astaxie/beego"
 	"github.com/yl10/kit/guid"
 )
 
@@ -40,7 +42,7 @@ func NewCardServ(ctx *utils.Context) *CardServ {
 }
 
 // GetCardList 获取卡列表
-func (s *CardServ) GetCardList(caseID string, pagenavi ...int) ([]model.TaCouponCard, int64, error) {
+func (s *CardServ) GetCardList(caseID, sendtype, usetype, usedid string, pagenavi ...int) ([]model.TaCouponCard, int64, error) {
 	filters := []string{}
 	if caseID != "" {
 		if err := utils.NewAuthEngine(s.ctx).CheckCase(caseID); err != nil {
@@ -66,7 +68,64 @@ func (s *CardServ) GetCardList(caseID string, pagenavi ...int) ([]model.TaCoupon
 			"case_id in ('" + strings.Join(caseIDs, "','") + "')",
 		}
 	}
-
+	if sendtype != "" {
+		filters = append(filters, "send_type='"+sendtype+"'")
+		if usetype != "" {
+			switch usetype {
+			case models.COUPONCARD_USETYPE_LUCKDRAW:
+				filters = append(filters,
+					`card_id not in (
+						SELECT
+						(
+							CASE
+							WHEN resource_id IS NULL THEN
+								''
+							ELSE
+								resource_id
+							END
+						)
+					FROM
+						sys_activity_action
+					WHERE
+						active_type = '`+models.ActGiveCard+`' and status>`+strconv.Itoa(models.STATUS_DEL)+`
+					union 
+						SELECT
+							a.coupon_card_id
+						FROM
+						ta_luckdraw_prize a inner join ta_luckdraw b on a.luckdraw_id = b.id
+						WHERE
+							a.coupon_card_type = '`+models.PRIZE_TYPE_CARD+`'
+							and a.luckdraw_id <> '`+usedid+`' and b.status>`+strconv.Itoa(models.STATUS_DEL)+`
+					) and used_count=0`)
+				break
+			case models.COUPONCARD_USETYPE_SYS:
+				filters = append(filters, `card_id not in (
+					SELECT
+					a.coupon_card_id
+					FROM
+					ta_luckdraw_prize a inner join ta_luckdraw b on a.luckdraw_id = b.id
+					WHERE
+					a.coupon_card_type = '`+models.PRIZE_TYPE_CARD+`' and b.status>`+strconv.Itoa(models.STATUS_DEL)+`
+					union 
+					SELECT
+						(
+							CASE
+							WHEN resource_id IS NULL THEN
+								''
+							ELSE
+								resource_id
+							END
+						)
+					FROM
+						sys_activity_action
+					WHERE
+						active_type = '`+models.ActGiveCard+`'
+						and action_id<>'`+usedid+`' and status>`+strconv.Itoa(models.STATUS_DEL)+`
+				) and used_count=0`)
+				break
+			}
+		}
+	}
 	limit := utils.GetPageNaviLimit(pagenavi...)
 	res, total, err := s.dao.GetCardList(filters, limit)
 	if err != nil {
@@ -392,6 +451,15 @@ func (s *CardServ) GetCustomerCardByID(id string) (*card.CustomerCardWithShare,
 	return card, nil
 }
 
+func (s *CardServ) GetSysCardList(caseid string) ([]model.TaCouponCard, error) {
+	cards, err := s.dao.GetSysCardList(caseid)
+	if err != nil {
+		utils.LogError("获取体验卡失败: " + err.Error())
+		return nil, errors.New("获取体验卡失败")
+	}
+	return cards, nil
+}
+
 // GetCaseUsableCard 获取案场可用卡
 func (s *CardServ) GetCaseUsableCard(page, pageSize int) (map[string]interface{}, error) {
 
@@ -471,13 +539,15 @@ func (s *CardServ) ReceiveCard(id, saleid, serialcode string) error {
 		utils.LogError("领取卡获取销售信息失败：", err)
 		return errors.New("log-error-领取卡失败！")
 	}
-	caseinfo, err := s.userDao.GetUserBelongCase(saleid)
-	if err != nil {
-		utils.LogError("领取卡获取销售案场信息失败：", err)
-		return errors.New("log-error-领取卡失败！")
-	}
-	if caseinfo.CaseId != card.CaseId {
-		return errors.New("log-error-销售不合法！")
+	if saleid != beego.AppConfig.String("defaultShareUserID") {
+		caseinfo, err := s.userDao.GetUserBelongCase(saleid)
+		if err != nil {
+			utils.LogError("领取卡获取销售案场信息失败：", err)
+			return errors.New("log-error-领取卡失败！")
+		}
+		if caseinfo.CaseId != card.CaseId {
+			return errors.New("log-error-销售不合法！")
+		}
 	}
 
 	// 验证码判断
@@ -489,7 +559,10 @@ func (s *CardServ) ReceiveCard(id, saleid, serialcode string) error {
 	if !isok {
 		return errors.New("log-error-该卡已被领取！")
 	}
-
+	salername := saler.RealName
+	if salername == "" {
+		salername = saler.UserName
+	}
 	// 领取
 	var customerCard = model.TaCustomerCard{
 		CustomerCardId:   utils.GetGUID(),
@@ -497,7 +570,7 @@ func (s *CardServ) ReceiveCard(id, saleid, serialcode string) error {
 		CustomerCardName: card.CardName,
 		CustomerId:       customer.CustomerId,
 		SalesId:          saler.UserId,
-		SalesName:        saler.UserName,
+		SalesName:        salername,
 		StartDate:        card.StartDate,
 		EndDate:          card.EndDate,
 		CaseId:           card.CaseId,

service/coupon/coupon.go

@@ -9,9 +9,11 @@ import (
 	"spaceofcheng/services/models/system"
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
+	"strconv"
 	"strings"
 	"time"
 
+	"github.com/astaxie/beego"
 	"github.com/yl10/kit/guid"
 )
 
@@ -34,7 +36,7 @@ func NewCouponServ(ctx *utils.Context) *CouponServ {
 }
 
 // GetCouponList 获取优惠券列表
-func (s *CouponServ) GetCouponList(caseID string, pagenavi ...int) ([]model.TaCoupon, int64, error) {
+func (s *CouponServ) GetCouponList(caseID, sendtype, usetype, usedid string, pagenavi ...int) ([]model.TaCoupon, int64, error) {
 	filters := []string{}
 
 	if caseID != "" {
@@ -61,7 +63,63 @@ func (s *CouponServ) GetCouponList(caseID string, pagenavi ...int) ([]model.TaCo
 			"case_id in ('" + strings.Join(caseIDs, "','") + "')",
 		}
 	}
-
+	if sendtype != "" {
+		filters = append(filters, "send_type='"+sendtype+"'")
+		if usetype != "" {
+			switch usetype {
+			case models.COUPONCARD_USETYPE_LUCKDRAW:
+				filters = append(filters, `coupon_id not in (
+					SELECT
+						(
+							CASE
+							WHEN resource_id IS NULL THEN
+								''
+							ELSE
+								resource_id
+							END
+						)
+					FROM
+						sys_activity_action
+					WHERE
+						active_type = '`+models.ActGiveCoupon+`' and status>`+strconv.Itoa(models.STATUS_DEL)+`
+					union 
+					SELECT
+						a.coupon_card_id
+					FROM
+					ta_luckdraw_prize a inner join ta_luckdraw b on a.luckdraw_id = b.id
+					WHERE
+						a.coupon_card_type = '`+models.PRIZE_TYPE_COUPON+`'
+						and a.luckdraw_id<>'`+usedid+`' and b.status>`+strconv.Itoa(models.STATUS_DEL)+`
+					) and used_count=0 `)
+				break
+			case models.COUPONCARD_USETYPE_SYS:
+				filters = append(filters, `coupon_id not in (
+					SELECT
+						a.coupon_card_id
+					FROM
+					ta_luckdraw_prize a inner join ta_luckdraw b on a.luckdraw_id = b.id
+					WHERE
+						a.coupon_card_type = '`+models.PRIZE_TYPE_COUPON+`' and b.status>`+strconv.Itoa(models.STATUS_DEL)+`
+					union
+					SELECT
+					(
+						CASE
+						WHEN resource_id IS NULL THEN
+							''
+						ELSE
+							resource_id
+						END
+					)
+				FROM
+					sys_activity_action
+				WHERE
+					active_type = '`+models.ActGiveCoupon+`'
+					and action_id<>'`+usedid+`' and status>`+strconv.Itoa(models.STATUS_DEL)+`
+				) and used_count=0`)
+				break
+			}
+		}
+	}
 	limit := utils.GetPageNaviLimit(pagenavi...)
 	res, total, err := s.dao.GetCouponList(filters, limit)
 	if err != nil {
@@ -514,13 +572,15 @@ func (s *CouponServ) ReceiveCoupon(id, saleid, serialcode string) error {
 		utils.LogError("领取优惠券获取销售信息失败：", err)
 		return errors.New("log-error-领取优惠券失败！")
 	}
-	caseinfo, err := s.userDao.GetUserBelongCase(saleid)
-	if err != nil {
-		utils.LogError("领取优惠券获取销售案场信息失败：", err)
-		return errors.New("log-error-领取优惠券失败！")
-	}
-	if caseinfo.CaseId != coupon.CaseId {
-		return errors.New("log-error-销售不合法！")
+	if saleid != beego.AppConfig.String("defaultShareUserID") {
+		caseinfo, err := s.userDao.GetUserBelongCase(saleid)
+		if err != nil {
+			utils.LogError("领取优惠券获取销售案场信息失败：", err)
+			return errors.New("log-error-领取优惠券失败！")
+		}
+		if caseinfo.CaseId != coupon.CaseId {
+			return errors.New("log-error-销售不合法！")
+		}
 	}
 
 	// 验证码判断
@@ -541,14 +601,17 @@ func (s *CouponServ) ReceiveCoupon(id, saleid, serialcode string) error {
 		hs := int64(coupon.ValidDays * 24)
 		endDate = time.Now().Local().Add(time.Hour * time.Duration(hs))
 	}
-
+	salername := saler.RealName
+	if salername == "" {
+		salername = saler.UserName
+	}
 	// 领取
 	var customerCoupon = model.TaCustomerCoupon{
 		CouponId:           coupon.CouponId,
 		CustomerCouponName: coupon.CouponName,
 		CustomerId:         customer.CustomerId,
 		SalesId:            saler.UserId,
-		SalesName:          saler.UserName,
+		SalesName:          salername,
 		StartDate:          startDate,
 		EndDate:            endDate,
 		CaseId:             coupon.CaseId,
@@ -678,3 +741,12 @@ func (s *CouponServ) GetCustomerCouponByCustomerAndSale(customerid string, page,
 		"page":     page,
 	}, nil
 }
+
+func (s *CouponServ) GetSysCouponByCase(caseid string) ([]model.TaCoupon, error) {
+	coupon, err := s.dao.GetSysCouponByCase(caseid)
+	if err != nil {
+		utils.LogError("获取系统赠送券失败: " + err.Error())
+		return nil, errors.New("获取系统赠送券失败")
+	}
+	return coupon, nil
+}

service/course/course.go

@@ -9,6 +9,7 @@ import (
 	"spaceofcheng/services/models/customer"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/models/system"
+	"spaceofcheng/services/models/vipcard"
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
 	"strings"
@@ -22,6 +23,7 @@ type CourseServ struct {
 	custDAO   *customer.CustomerDAO
 	userDAO   *system.UserDAO
 	couponDAO *coupon.CouponDAO
+	vipDAO    *vipcard.VipcardDAO
 }
 
 // NewCourseServ 初始化
@@ -33,6 +35,7 @@ func NewCourseServ(ctx *utils.Context) *CourseServ {
 		custDAO:   customer.NewCustomerDAO(ctx),
 		userDAO:   system.NewUserDAO(ctx),
 		couponDAO: coupon.NewCouponDAO(ctx),
+		vipDAO:    vipcard.NewVipcardDAO(ctx),
 	}
 }
 

service/course/order.go

@@ -12,14 +12,13 @@ import (
 	"github.com/yl10/kit/guid"
 )
 
-// Orders 下单
-func (s *CourseServ) Orders(
+// PreOrders 预下单
+// 保存订单信息
+func (s *CourseServ) PreOrders(
 	couseOrder *model.TaCourseOrders,
-	customercouponid string,
-) error {
+) (*model.TaCourseOrders, error) {
 	org := s.ctx.Get("org").(model.SysOrg)
 	cust := s.ctx.Get("customer").(model.TaCustomer)
-
 	// 校验人员
 	couseOrder.CustomerId = cust.CustomerId
 	if cust.UserId != "" {
@@ -30,39 +29,71 @@ func (s *CourseServ) Orders(
 		// 默认是卡券支付
 		couseOrder.PayType = models.CONSUME_COUPON
 	}
-
-	// TODO
-	// 校验案场
-	// caseID := couseOrder.CaseId
-	// if err := utils.NewAuthEngine(s.ctx).CheckCase(caseID); err != nil {
-	// 	return err
-	// }
-
 	// 校验课程
 	course, err := s.validCourse(couseOrder)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	if course.CourseDetail == nil || len(course.CourseDetail) == 0 {
-		return errors.New("定单课程尚未排课, 不能下单")
+		return nil, errors.New("定单课程尚未排课, 不能下单")
 	}
-
 	couseOrder.OrdersId = guid.NewGUIDString()
 	couseOrder.Price = course.Price // 课程价格, 即为订单价格
 	couseOrder.ActualAmount = course.Price
+	couseOrder.CouponAmount = "0.0"
 	couseOrder.CourseName = course.CourseName
 	couseOrder.CourseNum = course.CourseNum
 	couseOrder.OrgId = org.OrgId
-	couseOrder.Status = models.STATUS_NORMAL
-
-	// 默认是已支付
-	couseOrder.IsPay = models.BOOL_TRUE
+	couseOrder.Status = models.STATUS_READY
+	couseOrder.IsPay = models.BOOL_FALSE
 
 	if cust.Name != "" {
 		couseOrder.CustomerName = cust.Name
 	} else {
 		couseOrder.CustomerName = cust.CustomerName
 	}
+	// 入库
+	neworder, err := s.AddOrder(couseOrder)
+	if err != nil {
+		utils.LogError("课程下单失败: " + err.Error())
+		return nil, errors.New("下单失败, 请重试")
+	}
+	return neworder, nil
+}
+
+// ConfirmOrders 确认订单
+func (s *CourseServ) ConfirmOrders(ordersID, customercouponid string) error {
+
+	couseOrder, err := s.dao.GetOrderByID(ordersID)
+	if err != nil {
+		return utils.LogError("获取订单失败", err)
+	}
+
+	if couseOrder.Status != models.STATUS_READY {
+		return errors.New("没有订单信息")
+	}
+
+	if couseOrder.IsPay == models.BOOL_TRUE {
+		return errors.New("订单已付款，请勿重复付款！")
+	}
+
+	cust := s.ctx.Get("customer").(model.TaCustomer)
+
+	// TODO
+	// 校验案场
+	// caseID := couseOrder.CaseId
+	// if err := utils.NewAuthEngine(s.ctx).CheckCase(caseID); err != nil {
+	// 	return err
+	// }
+
+	// 校验课程
+	course, err := s.validCourse(couseOrder)
+	if err != nil {
+		return err
+	}
+	if course.CourseDetail == nil || len(course.CourseDetail) == 0 {
+		return errors.New("定单课程尚未排课, 不能下单")
+	}
 
 	account, err := s.custDAO.GetAccountByCust(cust.CustomerId)
 	if err != nil {
@@ -144,6 +175,18 @@ func (s *CourseServ) Orders(
 			utils.LogError("优惠券核销出错: " + err.Error())
 			return errors.New("优惠券核销出错")
 		}
+		// 券库存处理
+		var couponinfo = model.TaCoupon{
+			CouponId:  coupon.CouponId,
+			UsedCount: coupon.UsedCount + 1,
+		}
+		cols := []string{
+			"used_count",
+		}
+		if err := s.couponDAO.UpdateCoupon(&couponinfo, cols); err != nil {
+			utils.LogError("回填优惠券信息失败:", err)
+			return errors.New("回填优惠券信息失败！")
+		}
 	} else {
 		couseOrder.PayType = models.CONSUME_COINCHG
 		couseOrder.CouponAmount = "0.0"
@@ -165,19 +208,56 @@ func (s *CourseServ) Orders(
 
 	// 用户账户  -- 内部人员也可以购买
 	if actualAmount > 0 {
+		var leftPay = actualAmount
+		vips, err := s.custDAO.GetValidVIPCards(cust.CustomerId)
+		if err != nil {
+			return utils.LogError("查询用户 VIP卡 出错", err)
+		}
+
+		var vipAccount float64
+		if vips != nil && len(vips) > 0 {
+			for _, vip := range vips {
+				vipMoney, _ := strconv.ParseFloat(vip.Balance, 64)
+				vipAccount += vipMoney
+
+				// 当前扣款
+				var vipPay float64
+				if vipMoney > leftPay {
+					// 如果卡余额比 需要扣款的多, 那么就只扣这一张卡
+					// 通过 leftPay < 0.01 来判断
+					vipPay = leftPay
+					leftPay = 0
+				} else {
+					// 如果余额不够, 先扣掉本张卡余额, 继续循环
+					vipPay = vipMoney
+					leftPay -= vipMoney
+				}
+
+				if err := s.saveVipChangeRec(vipPay, &vip, couseOrder); err != nil {
+					return utils.LogError("VIP卡扣款失败", err.Error())
+				}
 
-		if actualAmount > accMoney {
-			return errors.New("账户余额不足")
+				if leftPay < 0.01 {
+					break
+				}
+			}
 		}
 
-		// 插入账户流水
-		if err := s.saveCustomerPayRec(account, couseOrder); err != nil {
-			utils.LogError("插入账户流水出错: " + err.Error())
-			return errors.New("写入账户流水出错")
+		// 如果 VIP 卡余额不足, 则使用账户余额
+		if leftPay > 0.01 {
+			if leftPay > accMoney {
+				return errors.New("账户余额不足")
+			}
+
+			// 插入账户流水
+			if err := s.saveCustomerPayRec(account, couseOrder, leftPay); err != nil {
+				utils.LogError("插入账户流水出错: " + err.Error())
+				return errors.New("写入账户流水出错")
+			}
 		}
 	}
 
-	// 入库
+	// 更新订单信息
 	if err := s.SaveOrder(couseOrder, course); err != nil {
 		utils.LogError("课程下单失败: " + err.Error())
 		return errors.New("下单失败, 请重试")
@@ -189,24 +269,32 @@ func (s *CourseServ) Orders(
 	return nil
 }
 
+// saveVipChangeRec 保存vip消费记录
+func (s *CourseServ) saveVipChangeRec(payMoney float64, custVIP *model.TaCustomerVip, info *model.TaCourseOrders) error {
+	vipChange := new(model.TaCustomerVipChange)
+	vipChange.CustomerVipId = custVIP.CustomerVipId
+	vipChange.CustomerId = info.CustomerId
+	vipChange.OrgId = info.OrgId
+	vipChange.CaseId = info.CaseId
+	vipChange.ChangeType = models.CONSUME_COINCHG
+	vipChange.FloatType = models.ACCOUNT_SPENT
+	vipChange.SourceId = info.OrdersId
+	vipChange.SourceName = "课程下单"
+	vipChange.Amount = strconv.FormatFloat(payMoney, 'f', -1, 64)
+
+	if err := s.vipDAO.InsertCustomerVipChange(*vipChange); err != nil {
+		return err
+	}
+
+	return s.custDAO.UpdateCustVipCardAmount(custVIP, payMoney)
+}
+
 // validCourse 校验课程
 func (s *CourseServ) validCourse(order *model.TaCourseOrders) (*course.CourseDetail, error) {
 	if order.CourseId == "" {
 		return nil, errors.New("没有获取到下单课程")
 	}
 
-	// custCourse, err := s.dao.GetCourseOfCustomer(order.CustomerId, order.CourseId)
-	// if err != nil {
-	// 	utils.LogError("校验用户课程失败: " + err.Error())
-	// 	return nil, errors.New("校验用户课程失败")
-	// }
-
-	// if custCourse != nil && custCourse.CustomerCourseId != "" {
-	// 	if custCourse.Status != models.STATUS_DEL {
-	// 		return nil, errors.New("用户已经拥有该课程, 不需要再次下单")
-	// 	}
-	// }
-
 	// 课程
 	course, err := s.dao.GetCourseInfo(order.CourseId)
 	if err != nil {
@@ -291,10 +379,10 @@ func (s *CourseServ) validBillCharges(
 }
 
 // saveCustomerPayRec 保存账户消费流水
-func (s *CourseServ) saveCustomerPayRec(account *model.TaCustomerAccount, info *model.TaCourseOrders) error {
+func (s *CourseServ) saveCustomerPayRec(account *model.TaCustomerAccount, info *model.TaCourseOrders, leftPay float64) error {
 	accBill := new(model.TaAccountChange)
 	accBill.AccountId = account.AccountId
-	accBill.Amount = info.ActualAmount
+	accBill.Amount = strconv.FormatFloat(leftPay, 'f', -1, 64)
 	accBill.CaseId = info.CaseId
 	accBill.ChangeSource = models.ACCSOURCE_COURSE_ORDERS
 	accBill.ChangeType = models.CONSUME_COINCHG
@@ -307,26 +395,26 @@ func (s *CourseServ) saveCustomerPayRec(account *model.TaCustomerAccount, info *
 	return s.custDAO.InsertAccountRecords(accBill)
 }
 
+// AddOrder 保存订单信息
+func (s *CourseServ) AddOrder(order *model.TaCourseOrders) (*model.TaCourseOrders, error) {
+	// 订单信息
+	order.Status = models.STATUS_READY
+	neworder, err := s.dao.SaveCourseOrder(order)
+	if err != nil {
+		utils.LogError("课程下单失败: " + err.Error())
+		return nil, errors.New("下单失败, 请重试")
+	}
+	return neworder, nil
+}
+
 // SaveOrder 保存订单明细
 func (s *CourseServ) SaveOrder(order *model.TaCourseOrders, course *course.CourseDetail) error {
 	// 订单信息
-	if err := s.dao.SaveCourseOrder(order); err != nil {
+	if err := s.dao.UpdateOrderPay(order); err != nil {
 		utils.LogError("课程下单失败: " + err.Error())
 		return errors.New("下单失败, 请重试")
 	}
 
-	// 默认城币购买
-	// courseObtaimType := models.COURSE_GETBY_COINCHG
-	// if coupons != nil && len(coupons) > 0 {
-	// 	for _, c := range coupons {
-	// 		if c.CouponType == models.COURSE_COUPON_CARD {
-	// 			courseObtaimType = models.COURSE_GETBY_CARD
-	// 		} else if c.CouponType == models.COURSE_COUPON_COUPON {
-	// 			courseObtaimType = models.COURSE_GETBY_COUPON
-	// 		}
-	// 	}
-	// }
-
 	// 我的课程信息
 	custCourse := model.TaCustomerCourse{
 		CourseId:         order.CourseId,

service/customer/customer.go

@@ -175,86 +175,105 @@ func (s *CustomerServ) BindWechatUser(userMap *model.TaUserMapping, phone string
 }
 
 // BindWechatCust 绑定微信用户
-func (s *CustomerServ) BindWechatCust(userMap *model.TaUserMapping, phone, caseID, userID string) (*model.TaCustomer, error) {
+func (s *CustomerServ) BindWechatCust(userMap *model.TaUserMapping, phone, recommendCode string) (*model.TaCustomer, error) {
 	cust, err := s.dao.GetCustomerByPhone(phone)
 	if err != nil {
 		utils.LogError(err.Error())
 		return nil, err
 	}
+	if cust != nil {
+		return nil, errors.New("当前手机号已被绑定或者注册")
+	}
 
 	// 用户不存在, 则新增
-	if cust == nil {
-		wxInfo := utils.WechatUser{}
-		if err := json.Unmarshal([]byte(userMap.AccountInfo), &wxInfo); err != nil {
-			utils.LogError("解析用户微信映射信息失败: " + err.Error())
-			return nil, errors.New("系统数据异常")
-		}
+	wxInfo := utils.WechatUser{}
+	if err := json.Unmarshal([]byte(userMap.AccountInfo), &wxInfo); err != nil {
+		utils.LogError("解析用户微信映射信息失败: " + err.Error())
+		return nil, errors.New("系统数据异常")
+	}
 
-		// 更新用户手机号码信息及userid信息
-		customer, err := s.dao.GetCustWithWXByOpenID(wxInfo.OpenID)
-		newCust := model.TaCustomer{
-			CustomerId:  customer.CustomerId,
-			Phone:       phone,
-			BindingDate: time.Now(),
-		}
-		// 校验案场信息
-		if caseID != "" {
-			cs, err := s.casedao.GetCaseByID(caseID)
-			if err != nil {
-				utils.LogError(err.Error())
-				return nil, err
-			}
-
-			if cs == nil || cs.Status == models.STATUS_DEL {
-				return nil, errors.New("系统无该推荐案场")
-			}
-
-			newCust.OrgId = cs.OrgId
-			newCust.RecommendCase = cs.CaseId
-		}
+	// 更新用户手机号码信息及userid信息
+	customer, err := s.dao.GetCustWithWXByOpenID(wxInfo.OpenID)
+	if err != nil {
+		return nil, utils.LogError("获取用户信息失败", err.Error())
+	}
 
-		// 校验推荐人
-		if userID != "" {
-			ar, err := s.dao.GetUserByID(userID)
-			if err != nil {
-				utils.LogError(err.Error())
-				return nil, err
-			}
-
-			if ar == nil || ar.Status == models.STATUS_DEL {
-				return nil, errors.New("系统无该推荐人")
-			}
-
-			newCust.OrgId = ar.OrgId
-			newCust.RecommendId = ar.UserId
-			newCust.RecommendName = ar.RealName
-		}
+	newCust := customer.TaCustomer
+	newCust.Phone = phone
+	newCust.BindingDate = time.Now().Local()
 
-		err = s.dao.UpdateCustomer(&newCust, []string{
-			"phone",
-			"recommend_id",
-			"recommend_case",
-			"recommend_name",
-			"binding_date",
-		})
+	// 校验案场信息
+	if recommendCode != "" {
+		user, err := s.dao.GetSalesByRecommendCode(recommendCode)
+		if err != nil {
+			utils.LogError(err.Error())
+			return nil, err
+		}
+		userCase, err := s.dao.GetSalesCaseById(user.UserId)
+		cs, err := s.casedao.GetCaseByID(userCase.CaseId)
 		if err != nil {
 			utils.LogError(err.Error())
 			return nil, err
 		}
 
-		cust = &newCust
-	} else {
-		if cust.Status != models.STATUS_NORMAL {
-			return nil, errors.New("用户状态不正确")
+		if cs == nil || cs.Status == models.STATUS_DEL {
+			return nil, errors.New("系统无该推荐案场")
 		}
+		if cs.Status == 0 {
+			return nil, errors.New("该案场暂未开放")
+		}
+
+		newCust.OrgId = cs.OrgId
+		newCust.RecommendCase = cs.CaseId
+
+		if user == nil || user.Status == models.STATUS_DEL {
+			return nil, errors.New("系统无该推荐人")
+		}
+
+		newCust.OrgId = user.OrgId
+		newCust.RecommendId = user.UserId
+		newCust.RecommendName = user.RealName
 	}
 
-	// triggerRegiteEvent 触发注册事件
-	if cust.RecommendCase != "" {
-		evtEngID := utils.EngineIDBy(cust.OrgId, cust.RecommendCase)
-		utils.EventEngineBus(evtEngID).EmitEvent(events.EvtRegiste, *cust)
+	// 校验推荐人
+	// if userID != "" {
+	// 	ar, err := s.dao.GetUserByID(userID)
+	// 	if err != nil {
+	// 		utils.LogError(err.Error())
+	// 		return nil, err
+	// 	}
+
+	// 	if ar == nil || ar.Status == models.STATUS_DEL {
+	// 		return nil, errors.New("系统无该推荐人")
+	// 	}
+
+	// 	newCust.OrgId = ar.OrgId
+	// 	newCust.RecommendId = ar.UserId
+	// 	newCust.RecommendName = ar.RealName
+	// }
+
+	err = s.dao.UpdateCustomer(&newCust, []string{
+		"phone",
+		"recommend_id",
+		"recommend_case",
+		"recommend_name",
+		"binding_date",
+	})
+	if err != nil {
+		utils.LogError(err.Error())
+		return nil, err
 	}
 
+	cust = &newCust
+
+	// triggerRegiteEvent 触发注册事件
+	// if cust.RecommendCase != "" {
+	evtEngID := utils.EngineIDBy(customer.OrgId, "")
+	evtEngine := utils.EventEngineBus(evtEngID)
+
+	evtEngine.EmitEvent(events.EvtRegiste, *cust)
+	// }
+
 	// 如果客户ID 与映射表中一致, 说明已经绑定过了
 	if cust.CustomerId == userMap.UserId {
 		return cust, nil
@@ -401,9 +420,11 @@ func (s *CustomerServ) GetCustomerInfo() (map[string]interface{}, error) {
 		utils.LogError("获取用户卡信息失败：", err)
 		return nil, err
 	}
+	balance, err := s.dao.GetCustomerVipAmount(customer.CustomerId)
 	return map[string]interface{}{
-		"account":   account,
-		"cardsnum":  len(card),
-		"couponnum": len(coupon),
+		"account":    account,
+		"cardsnum":   len(card),
+		"couponnum":  len(coupon),
+		"vipbalance": balance,
 	}, nil
 }

service/customerremark/customerremark.go

@@ -0,0 +1,90 @@
+package customerremark
+
+import (
+	"errors"
+	"spaceofcheng/services/models/customerremark"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service"
+	"spaceofcheng/services/utils"
+)
+
+type CustomerRemarkServ struct {
+	ctx *utils.Context
+	dao *customerremark.CustomerRemarkDAO
+}
+
+// NewCustomerRemarkServ 初始化
+func NewCustomerRemarkServ(ctx *utils.Context) *CustomerRemarkServ {
+	return &CustomerRemarkServ{
+		ctx: ctx,
+		dao: customerremark.NewCustomerRemarkDAO(ctx),
+	}
+}
+
+func (s *CustomerRemarkServ) GetCustomerRemarkList(salesId, customerId string, page, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	remarks, err := s.dao.GetRemarkList(salesId, customerId, page, pageSize)
+	if err != nil {
+		utils.LogError("获取客户备注列表失败: " + err.Error())
+		return nil, errors.New("获取客户备注列表失败")
+	}
+	total, err := s.dao.GetRemarkListCount(salesId, customerId)
+	if err != nil {
+		utils.LogError("获取客户备注列表失败: " + err.Error())
+		return nil, errors.New("获取客户备注列表失败")
+	}
+	return map[string]interface{}{
+		"list":     remarks,
+		"pageSize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, nil
+}
+
+func (s *CustomerRemarkServ) GetCustomerReceiveRecord(customerId, salesId string, page, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	record, err := s.dao.CustomerReceiveRecord(customerId, salesId, page, pageSize)
+	if err != nil {
+		utils.LogError("获取客户领取列表失败: " + err.Error())
+		return nil, errors.New("获取客户领取列表失败")
+	}
+	total, err := s.dao.CustomerReceiveRecordCount(customerId, salesId)
+	if err != nil {
+		utils.LogError("获取客户领取列表失败: " + err.Error())
+		return nil, errors.New("获取客户领取列表失败")
+	}
+	return map[string]interface{}{
+		"list":     record,
+		"pageSize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, nil
+}
+func (s *CustomerRemarkServ) AddRemark(remark model.TaSaleCustomerRemark) (*model.TaSaleCustomerRemark, error) {
+	newRemark, err := s.dao.AddRemark(remark)
+	if err != nil {
+		utils.LogError("保存客户备注失败: " + err.Error())
+		return nil, errors.New("保存客户备注失败")
+	}
+	return newRemark, nil
+}
+func (s *CustomerRemarkServ) SearchCustomer(customerInfo, salesId string) (*model.TaCustomer, error) {
+	customer, err := s.dao.SearchCustomer(customerInfo, salesId)
+	if err != nil {
+		utils.LogError("获取客户信息失败: " + err.Error())
+		return nil, errors.New("获取客户信息失败")
+	}
+	return &customer, nil
+}
+func (s *CustomerRemarkServ) IsExist(recommendCode string) (int, error) {
+	num, err := s.dao.IsExist(recommendCode)
+	if err != nil {
+		utils.LogError("获取推荐人失败: " + err.Error())
+		return 0, errors.New("获取推荐人失败")
+	}
+	return num, nil
+}

service/events/constant.go

@@ -13,4 +13,5 @@ const (
 
 	// 送券
 	ActGiveCoupon = "giveCoupon"
+	ActGiveCard   = "giveCard"
 )

service/events/events.go

@@ -17,8 +17,11 @@ var EvtActions = map[string]tinyevent.Action{
 	// 测试
 	ActTest: tsAction,
 
-	// 赠送卡券
+	// 赠送券
 	ActGiveCoupon: giveCoupon,
+
+	// 赠送卡
+	ActGiveCard: giveCard,
 }
 
 // ListenAllEvent 监听所有事件
@@ -26,11 +29,12 @@ func ListenAllEvent(orgID, caseID string) {
 	mtx.Lock()
 	defer mtx.Unlock()
 
-	evtEngID := utils.EngineIDBy(orgID, caseID)
+	// 2018年10月30日 yansen 不区分案场
+	evtEngID := utils.EngineIDBy(orgID, "")
 	evtEngine := utils.ResetEventEngineBus(evtEngID)
 
 	// 所有需要执行的事件
-	allEvts, err := getAllEvents(orgID, caseID)
+	allEvts, err := getAllEvents(orgID, "")
 	if err != nil {
 		utils.LogError(err)
 	}
@@ -39,6 +43,7 @@ func ListenAllEvent(orgID, caseID string) {
 	for evt, acts := range allEvts {
 		for _, actKey := range acts {
 			act, ok := EvtActions[actKey]
+
 			if ok {
 				evtEngine.ListenEvent(evt, act)
 			}
@@ -54,7 +59,7 @@ func getAllEvents(orgID, caseID string) (map[string][]string, error) {
 	var acts []model.SysActivityAction
 
 	if err := db.Where("org_id=?", orgID).
-		And("case_id=?", caseID).
+		// And("case_id=?", caseID).
 		And("status=?", models.STATUS_NORMAL).
 		Find(&evts); err != nil {
 		utils.LogError("查询营销活动配置表失败: " + err.Error())
@@ -63,7 +68,11 @@ func getAllEvents(orgID, caseID string) (map[string][]string, error) {
 
 	res := make(map[string][]string)
 	for _, evtSetting := range evts {
-		res[evtSetting.ActivityType] = make([]string, 0)
+		tpEvts, ok := res[evtSetting.ActivityType]
+		if !ok {
+			tpEvts = make([]string, 0)
+		}
+
 		acts = make([]model.SysActivityAction, 0)
 
 		if err := db.Where("activity_id=?", evtSetting.ActivityId).Find(&acts); err != nil {
@@ -72,8 +81,15 @@ func getAllEvents(orgID, caseID string) (map[string][]string, error) {
 		}
 
 		for _, act := range acts {
-			res[evtSetting.ActivityType] = append(res[evtSetting.ActivityType], act.ActiveType)
+			utils.LogInfo(act)
+
+			// 加入 tpEvts 需要去重
+			if utils.StrSliceIndexOf(tpEvts, act.ActiveType) == -1 {
+				tpEvts = append(tpEvts, act.ActiveType)
+			}
 		}
+
+		res[evtSetting.ActivityType] = tpEvts
 	}
 
 	return res, nil
@@ -85,14 +101,25 @@ var tsAction = func(e tinyevent.Event) error {
 	return nil
 }
 
-func init() {
-	cases, err := models.GetAllCases()
+func EventInit() {
+	// cases, err := models.GetAllCases()
+	// if err != nil {
+	// 	utils.LogError("获取有效案场列表失败: " + err.Error())
+	// 	return
+	// }
+
+	// for _, cs := range cases {
+	// 	ListenAllEvent(cs.OrgId, cs.CaseId)
+	// }
+
+	// 不区分案场
+	orgs, err := models.GetAllOrgs()
 	if err != nil {
-		utils.LogError("获取有效案场列表失败: " + err.Error())
+		utils.LogError("获取机构列表失败: " + err.Error())
 		return
 	}
 
-	for _, cs := range cases {
-		ListenAllEvent(cs.OrgId, cs.CaseId)
+	for _, org := range orgs {
+		ListenAllEvent(org.OrgId, "")
 	}
 }

service/events/giveCard.go

@@ -0,0 +1,85 @@
+package events
+
+import (
+	"encoding/json"
+	"errors"
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service/card"
+	"spaceofcheng/services/utils"
+
+	"github.com/zjxpcyc/tinyevent"
+)
+
+var giveCard = func(e tinyevent.Event) error {
+	utils.LogInfo("开始卡赠送操作...")
+
+	ctx := NewContext()
+	defer DestroyContext(ctx, false)
+
+	if e.Payload == nil {
+		utils.LogError("注册送卡失败, 没有用户信息")
+		return errors.New("注册送卡失败, 没有用户信息")
+	}
+	cust := e.Payload.(model.TaCustomer)
+	// caseID := cust.RecommendCase
+	orgID := cust.OrgId
+
+	utils.LogInfo("被赠送人: " + cust.CustomerId)
+
+	// 不区分案场，随便送
+	// 2018年10月30日 yansen 按照产品要求
+	query := `
+		SELECT
+			t.*
+		FROM
+			sys_activity_action t
+		JOIN sys_activity s ON t.activity_id = s.activity_id
+		WHERE
+		t.active_type = 'giveCard'
+		AND	s.org_id = ?
+		AND s.status = ?
+		AND s.activity_type = ?
+	`
+
+	var acts []model.SysActivityAction
+	if err := models.DBEngine.SQL(query, orgID, models.STATUS_NORMAL, e.Name).Find(&acts); err != nil {
+		utils.LogError("检查营销活动失败: " + err.Error())
+		return errors.New("检查营销活动失败")
+	}
+
+	fromUser := model.SysUser{
+		UserId:   "SYSTEM",
+		UserName: "system",
+	}
+	cpServ := card.NewCardServ(ctx)
+	for _, act := range acts {
+		switch act.ActiveType {
+		case ActGiveCard:
+			res := make(map[string]interface{})
+			if err := json.Unmarshal([]byte(act.ResourceDesc), &res); err != nil {
+				utils.LogError("解析体验卡赠送规则失败: " + err.Error())
+				continue
+			}
+
+			cpID, has := res["giftValue"]
+			if !has {
+				continue
+			}
+
+			cp, err := cpServ.GetCardByID(cpID.(string))
+			if err != nil {
+				utils.LogError("获取体验卡失败: " + err.Error())
+				continue
+			}
+
+			if err := cpServ.GiveCardTo(&fromUser, &cust, cp); err != nil {
+				utils.LogError("送卡失败: " + err.Error())
+				continue
+			}
+		default:
+			utils.LogError("暂不支持的赠送类型")
+		}
+	}
+	return nil
+}

service/events/giveCoupon.go

@@ -7,6 +7,7 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/coupon"
 	"spaceofcheng/services/utils"
+	"strings"
 
 	"github.com/zjxpcyc/tinyevent"
 )
@@ -14,7 +15,7 @@ import (
 // giveCoupon 赠送卡券
 // Event.Payload.customer  = model.TaCustomer
 var giveCoupon = func(e tinyevent.Event) error {
-	utils.LogInfo("开始卡券赠送操作...")
+	utils.LogInfo("开始券赠送操作...")
 
 	ctx := NewContext()
 	defer DestroyContext(ctx, false)
@@ -25,11 +26,13 @@ var giveCoupon = func(e tinyevent.Event) error {
 	}
 
 	cust := e.Payload.(model.TaCustomer)
-	caseID := cust.RecommendCase
+	// caseID := cust.RecommendCase
 	orgID := cust.OrgId
 
 	utils.LogInfo("被赠送人: " + cust.CustomerId)
 
+	// 不区分案场，随便送
+	// 2018年10月30日 yansen 按照产品要求
 	query := `
 		SELECT
 			t.*
@@ -37,14 +40,14 @@ var giveCoupon = func(e tinyevent.Event) error {
 			sys_activity_action t
 		JOIN sys_activity s ON t.activity_id = s.activity_id
 		WHERE
-			s.org_id = ?
-		AND s.case_id = ?
+		t.active_type = 'giveCoupon'
+		AND	s.org_id = ?
 		AND s.status = ?
 		AND s.activity_type = ?
 	`
 
 	var acts []model.SysActivityAction
-	if err := models.DBEngine.SQL(query, orgID, caseID, models.STATUS_NORMAL, e.Name).Find(&acts); err != nil {
+	if err := models.DBEngine.SQL(query, orgID, models.STATUS_NORMAL, e.Name).Find(&acts); err != nil {
 		utils.LogError("检查营销活动失败: " + err.Error())
 		return errors.New("检查营销活动失败")
 	}
@@ -60,7 +63,7 @@ var giveCoupon = func(e tinyevent.Event) error {
 		switch act.ActiveType {
 		case ActGiveCoupon:
 			res := make(map[string]interface{})
-			if err := json.Unmarshal([]byte(act.ResourceDesc), &res); err != nil {
+			if err := json.Unmarshal([]byte(strings.Replace(act.ResourceDesc, "\n", "\\n", -1)), &res); err != nil {
 				utils.LogError("解析优惠券赠送规则失败: " + err.Error())
 				continue
 			}

service/flashbuy/flashbuy.go

@@ -0,0 +1,377 @@
+package flashbuy
+
+import (
+	"errors"
+	"fmt"
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/course"
+	"spaceofcheng/services/models/flashbuy"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/models/verify"
+	"spaceofcheng/services/service"
+	"spaceofcheng/services/utils"
+	"time"
+)
+
+// FlashBuyServ 系统处理
+type FlashBuyServ struct {
+	ctx       *utils.Context
+	dao       *flashbuy.FlashbuyDAO
+	vdao      *verify.VerifyDAO
+	courseDAO *course.CourseDAO
+}
+
+// NewFlashBuyServ 初始化
+func NewFlashBuyServ(ctx *utils.Context) *FlashBuyServ {
+	return &FlashBuyServ{
+		ctx:       ctx,
+		dao:       flashbuy.NewFlashbuyDAO(ctx),
+		vdao:      verify.NewVerifyDAO(ctx),
+		courseDAO: course.NewCourseDAO(ctx),
+	}
+}
+
+func (s *FlashBuyServ) GetFlashBuyList(caseid, flashBuyName, flashBuyStatus string, page, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	flashbuys, err := s.dao.GetFlashBuyList(caseid, flashBuyName, flashBuyStatus, page, pageSize)
+	if err != nil {
+		utils.LogError("获取抢购活动列表失败: " + err.Error())
+		return nil, errors.New("获取抢购活动列表失败")
+	}
+	total, err := s.dao.GetFlashBuyListCount(caseid, flashBuyName, flashBuyStatus)
+	if err != nil {
+		utils.LogError("获取抢购活动列表失败: " + err.Error())
+		return nil, errors.New("获取抢购活动列表失败")
+	}
+	return map[string]interface{}{
+		"list":     flashbuys,
+		"pageSize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, nil
+}
+func (s *FlashBuyServ) GetFlashBuyById(flashBuyId string) (*model.TaFlashBuy, error) {
+	flashbuy, err := s.dao.GetFlashBuyById(flashBuyId)
+	if err != nil {
+		utils.LogError("获取抢购活动信息失败: " + err.Error())
+		return nil, errors.New("获取抢购活动信息失败")
+	}
+	return flashbuy, nil
+}
+
+// GetFlashByUser 获取用户的抢购信息
+func (s *FlashBuyServ) GetFlashByUser(id string) ([]model.TaCustomerFlashBuy, error) {
+	cst := s.ctx.Get("customer")
+	if cst == nil {
+		return nil, errors.New("系统内部错误")
+	}
+	flashbuys, err := s.dao.GetCustomerFlashBuy(id, cst.(model.TaCustomer).CustomerId)
+	return flashbuys, err
+}
+
+func (s *FlashBuyServ) SaveFlashBuy(flashbuy model.TaFlashBuy) (*model.TaFlashBuy, error) {
+	var newFlashBuy *model.TaFlashBuy
+	var err error
+	if flashbuy.CaseId == "" {
+		return nil, utils.LogError("请选择所属案场！")
+	}
+	if flashbuy.FlashBuyName == "" {
+		return nil, utils.LogError("请输入活动标题！")
+	}
+	if flashbuy.FlashBuyInfo == "" {
+		return nil, utils.LogError("请输入活动说明！")
+	}
+	if flashbuy.ModelId == "" {
+		return nil, utils.LogError("请选择活动模板！")
+	}
+	if flashbuy.FlashBuyId == "" {
+		org := s.ctx.Get("org").(model.SysOrg)
+		flashbuy.OrgId = org.OrgId
+		newFlashBuy, err = s.dao.AddNewFlashBuy(flashbuy)
+	} else {
+		err = s.dao.EditFlashBuy(flashbuy)
+		newFlashBuy = &flashbuy
+	}
+	if err != nil {
+		utils.LogError("保存抢购活动信息失败: " + err.Error())
+		return nil, errors.New("保存抢购活动信息失败")
+	}
+	return newFlashBuy, nil
+}
+
+func (s *FlashBuyServ) UpdateFlashBuy(flashBuyId, flashBuyStatus string) error {
+	err := s.dao.UpdateFlashBuy(flashBuyId, flashBuyStatus)
+	if err != nil {
+		utils.LogError("更新活动状态失败: " + err.Error())
+		return errors.New("更新活动状态失败")
+	}
+	return err
+}
+func (s *FlashBuyServ) DeleteFlashBuy(flashBuyId string) error {
+	err := s.dao.DeleteFlashBuy(flashBuyId)
+	if err != nil {
+		utils.LogError("删除抢购活动信息失败: " + err.Error())
+		return errors.New("删除抢购活动信息失败")
+	}
+	return err
+}
+
+func (s *FlashBuyServ) GetCustomerFlashBuyById(flashBuyId, phone string, page, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	flashbuys, err := s.dao.GetCustomerFlashBuyById(flashBuyId, phone, page, pageSize)
+	if err != nil {
+		utils.LogError("获取记录列表失败: " + err.Error())
+		return nil, errors.New("获取获取记录列表失败")
+	}
+	total, err := s.dao.GetCustomerFlashBuyByIdCount(flashBuyId, phone)
+	if err != nil {
+		utils.LogError("获取记录列表失败: " + err.Error())
+		return nil, errors.New("获取获取记录列表失败")
+	}
+	return map[string]interface{}{
+		"list":     flashbuys,
+		"pageSize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, nil
+}
+
+func (s *FlashBuyServ) VerifyCustomerFlashBuyList(qrcode, caseId string) (*flashbuy.CustomerFlashBuy, error) {
+	var err error
+	var customerFlashBuyId string
+	var customerVerify *flashbuy.CustomerFlashBuy
+	customerFlashBuyId, err = s.vdao.GetCustomerCourseIdByQrcode(qrcode)
+	if err != nil {
+		utils.LogError("获取核销列表失败: " + err.Error())
+		return nil, errors.New("获取核销列表失败")
+	}
+	customerVerify, err = s.dao.GetCustomerFlashBuyByQr(customerFlashBuyId, caseId)
+	if err != nil {
+		utils.LogError("获取核销列表失败: " + err.Error())
+		return nil, errors.New("获取核销列表失败")
+	}
+	if customerVerify == nil {
+		return nil, errors.New("未查到奖品信息")
+	}
+	return customerVerify, nil
+
+}
+
+func (s *FlashBuyServ) Verify(customerFlashBuyId string) error {
+	err := s.dao.VerifyFlashBuy(customerFlashBuyId)
+	if err != nil {
+		utils.LogError("核销失败: " + err.Error())
+		return errors.New("核销失败")
+	}
+	return nil
+}
+
+func (s *FlashBuyServ) GetCustomerFlashBuyByCustomerId(customerId string, page, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	flashbuys, err := s.dao.GetCustomerFlashBuyByCustomerId(customerId, page, pageSize)
+	if err != nil {
+		utils.LogError("获取抢购活动列表失败: " + err.Error())
+		return nil, errors.New("获取抢购活动列表失败")
+	}
+	total, err := s.dao.GetCustomerFlashBuyByCustomerIdCount(customerId)
+	if err != nil {
+		utils.LogError("获取抢购活动列表失败: " + err.Error())
+		return nil, errors.New("获取抢购活动列表失败")
+	}
+	return map[string]interface{}{
+		"list":     flashbuys,
+		"pageSize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, nil
+}
+
+func (s *FlashBuyServ) GetCustomerFlashBuyId(customerFlashBuyId string) (*flashbuy.CustomerFlashDetail, error) {
+	flashbuy, err := s.dao.GetCustomerFlashBuyId(customerFlashBuyId)
+	if err != nil {
+		utils.LogError("获取抢购活动信息失败: " + err.Error())
+		return nil, errors.New("获取抢购活动信息失败")
+	}
+	return flashbuy, nil
+}
+
+// FlashBuy 抢购
+func (s *FlashBuyServ) FlashBuy(id string) error {
+	flashbuy, err := s.dao.GetFlashBuyById(id)
+	if err != nil {
+		utils.LogError("获取抢购活动信息失败: " + err.Error())
+		return errors.New("获取抢购活动信息失败！")
+	}
+	if flashbuy.Status != models.STATUS_NORMAL {
+		return errors.New("抢购活动状态异常！")
+	}
+	if time.Now().After(flashbuy.EndDate) {
+		return errors.New("活动已结束！")
+	}
+	if flashbuy.FlashBuyStatus != models.FLASH_BUY_ACTIVE {
+		return errors.New("活动已停用！")
+	}
+	if time.Now().Before(flashbuy.StartDate) {
+		return errors.New("活动还未开始！")
+	}
+	customer := s.ctx.Get("customer").(model.TaCustomer)
+	if flashbuy.AttendantType == models.FLASHBUY_USER_NEW {
+		flashCustomer, err := s.dao.IsFlashBuyCustomer(customer.CustomerId, id)
+		if err != nil {
+			utils.LogError("获取客户抢购信息失败: " + err.Error())
+			return errors.New("获取客户抢购信息失败！")
+		}
+		if flashCustomer.IsNew == models.BOOL_FALSE {
+			return errors.New("此活动仅限新用户参加！")
+		}
+	}
+
+	buys, err := s.dao.GetCustomerFlashBuy(id, customer.CustomerId)
+	if err != nil {
+		utils.LogError("获取客户抢购信息失败: " + err.Error())
+		return errors.New("获取客户抢购信息失败！")
+	}
+	if len(buys) > 0 {
+		return errors.New("您已参与过该活动！")
+	}
+	if flashbuy.JoinNum >= flashbuy.FlashBuyMaxAttendant {
+		err = s.dao.UpdateFlashBuy(flashbuy.FlashBuyId, models.FLASH_BUY_OVER)
+		if err != nil {
+			utils.LogError("更新状态失败: " + err.Error())
+		}
+		return errors.New("活动已结束！")
+	}
+	var customerFlashBuy model.TaCustomerFlashBuy
+	customerFlashBuy.FlashBuyId = flashbuy.FlashBuyId
+	customerFlashBuy.CustomerId = customer.CustomerId
+	customerFlashBuy.CaseId = flashbuy.CaseId
+	customerFlashBuy.OrgId = flashbuy.OrgId
+	if flashbuy.ValidateType == models.FLASH_VALIDATE_DATE {
+		customerFlashBuy.ValidateStart = flashbuy.ValidateStart
+		customerFlashBuy.ValidateEnd = flashbuy.ValidateEnd
+	} else {
+		customerFlashBuy.ValidateStart = time.Now().Local()
+		customerFlashBuy.ValidateEnd = time.Now().Local().AddDate(0, 0, flashbuy.ValidateDays)
+	}
+	recored, err := s.dao.SaveCustomerFlashBuy(customerFlashBuy)
+	if err != nil {
+		utils.LogError("保存用户抢购信息失败: " + err.Error())
+		return errors.New("抢购失败！")
+	}
+	num, err := s.dao.UpdateFlashBuyJoin(flashbuy.FlashBuyId)
+	if err != nil {
+		utils.LogError("抢购失败: " + err.Error())
+		return errors.New("抢购失败！")
+	}
+	if num < 1 {
+		err = s.dao.UpdateFlashBuy(flashbuy.FlashBuyId, models.FLASH_BUY_OVER)
+		if err != nil {
+			utils.LogError("更新状态失败: " + err.Error())
+		}
+		return errors.New("活动已结束！")
+	}
+	custQRCode := model.TaCustomerCourseQrcode{
+		CustomerCourseId: recored.CustomerFlashBuyId,
+		CustomerQrcode:   utils.GenerateQRCode(),
+		CreateDate:       time.Now().Local(),
+		Status:           models.STATUS_NORMAL,
+		QrcodeType:       models.QRCODE_TYPE_FLASH,
+	}
+
+	if err := s.courseDAO.SaveCustomerCourseQrcode(&custQRCode); err != nil {
+		utils.LogError("插入中奖二维码失败: " + err.Error())
+		return errors.New("写入中奖二维码失败")
+	}
+	// ---------------推送消息
+
+	// 推送微信消息
+	userMap := s.ctx.Get("userMap").(model.TaUserMapping)
+	clienturl := s.ctx.Get("clienturl").(string)
+	tplID := s.ctx.Get("tplid").(string)
+
+	cs, err := models.GetCaseByID(recored.CaseId)
+	if err != nil {
+		utils.LogError("推送微信消息失败, 查询案场信息出错: " + err.Error())
+		// 但是不返回错误
+		return nil
+	}
+
+	caseName := cs.CaseName
+	remarkTpl := "请在%s日前, 前往%s兑换"
+
+	message := utils.Message{
+		To: utils.ClientID{ID: userMap.Openid},
+		Data: map[string]interface{}{
+			"orgid": recored.OrgId,
+			"tplid": tplID,
+			"link":  clienturl,
+			"data": map[string]string{
+				"first":    "抢券成功提醒",
+				"keyword1": flashbuy.FlashBuyName,
+				"keyword2": time.Now().Local().Format("2006-01-02"),
+				"remark":   fmt.Sprintf(remarkTpl, recored.ValidateEnd.Format("2006-01-02"), caseName),
+			},
+		},
+	}
+	go utils.SendWechat(message)
+
+	return nil
+}
+
+func (s *FlashBuyServ) GetFlashModelList() ([]model.TdFlashbuyModel, error) {
+	model, err := s.dao.GetFlashModelList()
+	if err != nil {
+		utils.LogError("获取抢购活动模板失败: " + err.Error())
+		return nil, errors.New("获取抢购活动模板失败")
+	}
+	return model, nil
+}
+
+func (s *FlashBuyServ) AddNewFlashBuyCustomer(customer model.TaCustomer, flashBuyId string) error {
+	count, err := s.dao.IsRecord(customer.CustomerId, flashBuyId)
+	if err != nil {
+		utils.LogError("存储用户抢购记录失败: " + err.Error())
+		return errors.New("存储用户抢购记录失败")
+	}
+	if count <= 0 {
+		var flashBuyCustomer = model.TaFlashBuyCustomer{
+			FlashBuyId: flashBuyId,
+			CustomerId: customer.CustomerId,
+		}
+		if customer.Phone == "" {
+			flashBuyCustomer.IsNew = 1
+		} else {
+			flashBuyCustomer.IsNew = 0
+		}
+		err := s.dao.AddNewFlashBuyCustomer(flashBuyCustomer)
+		if err != nil {
+			utils.LogError("存储用户抢购记录失败: " + err.Error())
+			return errors.New("存储用户抢购记录失败")
+		}
+	}
+
+	return nil
+}
+func (s *FlashBuyServ) UpdateFlashBuyCustomer(customerId, flashBuyId string) error {
+	err := s.dao.UpdateFlashBuyCustomer(customerId, flashBuyId)
+	if err != nil {
+		utils.LogError("更新用户抢购记录失败: " + err.Error())
+		return errors.New("更新用户抢购记录失败")
+	}
+	return nil
+}
+
+func (s *FlashBuyServ) IsFlashBuyCustomer(customerId, flashBuyId string) (*model.TaFlashBuyCustomer, error) {
+	flashBuyCustomer, err := s.dao.IsFlashBuyCustomer(customerId, flashBuyId)
+	if err != nil {
+		utils.LogError("判断是否参与失败: " + err.Error())
+		return nil, errors.New("判断是否参与失败")
+	}
+	return flashBuyCustomer, nil
+}

service/goods/goods.go

@@ -9,6 +9,7 @@ import (
 	"spaceofcheng/services/models/goods"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/models/system"
+	"spaceofcheng/services/models/vipcard"
 	"spaceofcheng/services/utils"
 	"strings"
 )
@@ -21,6 +22,7 @@ type GoodsServ struct {
 	custDAO   *customer.CustomerDAO
 	userDAO   *system.UserDAO
 	couponDAO *coupon.CouponDAO
+	vipDAO    *vipcard.VipcardDAO
 }
 
 // NewGoodsServ 初始化
@@ -32,6 +34,7 @@ func NewGoodsServ(ctx *utils.Context) *GoodsServ {
 		custDAO:   customer.NewCustomerDAO(ctx),
 		userDAO:   system.NewUserDAO(ctx),
 		couponDAO: coupon.NewCouponDAO(ctx),
+		vipDAO:    vipcard.NewVipcardDAO(ctx),
 	}
 }
 

service/goods/orders.go

@@ -16,46 +16,85 @@ import (
 	"github.com/yl10/kit/guid"
 )
 
-// Orders 下单
-func (s *GoodsServ) Orders(
+// PreOrders 预下单
+func (s *GoodsServ) PreOrders(
 	info *model.TaGoodsOrders,
 	details []model.TaGoodsOrdersDetail,
-	customercouponid,
-	innerUser string) error {
-	// org := s.ctx.Get("org").(model.SysOrg)
+	innerUser string,
+) (*model.TaGoodsOrders, error) {
 	cust := s.ctx.Get("customer").(model.TaCustomer)
 
 	info.OrdersId = guid.NewGUIDString()
 	info.MakeStatus = goods.MAKESTATUS_NOTSTARTED
 	info.UserId = cust.CustomerId
+	info.IsPay = models.BOOL_FALSE
+	info.ActualAmount = "0.0"
+	info.CouponAmount = "0.0"
 	num, err := s.dao.GetOrderNumByUserNow(info.UserId)
 	if err != nil {
 		utils.LogError("获取5秒钟内是否下单错误:", err)
-		return errors.New("获取5秒钟内是否下单错误")
+		return nil, errors.New("获取5秒钟内是否下单错误")
 	}
 	if num > 0 {
-		return errors.New("5 秒内不能频繁下单")
+		return nil, errors.New("5 秒内不能频繁下单")
 	}
 
 	// 校验下单内容
 	if err := s.validOrdersInfo(info); err != nil {
-		return err
+		return nil, err
 	}
 
 	// 校验案场信息
 	if err := s.validOrdersCase(info, cust); err != nil {
-		return err
+		return nil, err
 	}
 
 	// 校验各种金额
 	if err := s.validBillCharges(info, details); err != nil {
-		return err
+		return nil, err
 	}
 
 	if innerUser == "sales" {
 		info.PayType = models.CONSUME_INNER
 		// 内部人员, 可以直接购买
 		// TODO
+	} else {
+		info.PayType = models.CONSUME_COUPON
+	}
+
+	// 保存主订单
+	if err := s.dao.SaveOrders(info); err != nil {
+		return nil, err
+	}
+
+	// 保存订单明细
+	if err := s.dao.SaveOrdersDetail(details, info.OrdersId); err != nil {
+		return nil, err
+	}
+
+	return info, nil
+}
+
+// ConfirmOrder 订单确认
+func (s *GoodsServ) ConfirmOrder(ordersID, customercouponid, remark string) error {
+	info, err := s.dao.GetOrdersByID(ordersID)
+	if err != nil {
+		return utils.LogError("获取订单失败", err)
+	}
+
+	if info.Status != models.STATUS_READY {
+		return errors.New("没有订单信息")
+	}
+
+	if info.IsPay == models.BOOL_TRUE {
+		return errors.New("订单已付款，请勿重复付款！")
+	}
+
+	info.Remark = remark
+
+	if info.PayType == models.CONSUME_INNER {
+		// 内部人员, 可以直接购买
+		// TODO
 	} else {
 		// 普通客户
 		account, err := s.custDAO.GetAccountByCust(info.UserId)
@@ -103,12 +142,12 @@ func (s *GoodsServ) Orders(
 				Price:   "0.0",
 				GoodsId: "",
 			}
-			for _, detail := range details {
+			for _, detail := range info.Goods {
 				if coupon.IsAll == 1 {
 					dyprice, _ := strconv.ParseFloat(dyGoods.Price, 64)
 					detailprice, _ := strconv.ParseFloat(detail.Price, 64)
 					if dyprice < detailprice {
-						dyGoods = detail
+						dyGoods = detail.TaGoodsOrdersDetail
 					}
 				} else {
 					for _, target := range coupon.Targets {
@@ -116,7 +155,7 @@ func (s *GoodsServ) Orders(
 							dyprice, _ := strconv.ParseFloat(dyGoods.Price, 64)
 							detailprice, _ := strconv.ParseFloat(detail.Price, 64)
 							if dyprice < detailprice {
-								dyGoods = detail
+								dyGoods = detail.TaGoodsOrdersDetail
 							}
 						}
 					}
@@ -135,7 +174,7 @@ func (s *GoodsServ) Orders(
 					UsedAmount:       dyGoods.Price,
 					CustomerCouponId: customerCoupon.CustomerCouponId,
 				}
-				if err := s.dao.SaveOrdersCoupon(&ordersCoupon, info); err != nil {
+				if err := s.dao.SaveOrdersCoupon(&ordersCoupon, &info.TaGoodsOrders); err != nil {
 					utils.LogError("保存优惠信息出错: " + err.Error())
 					return errors.New("保存优惠信息出错")
 				}
@@ -148,6 +187,18 @@ func (s *GoodsServ) Orders(
 					utils.LogError("优惠券核销出错: " + err.Error())
 					return errors.New("优惠券核销出错")
 				}
+				// 券库存处理
+				var couponinfo = model.TaCoupon{
+					CouponId:  coupon.CouponId,
+					UsedCount: coupon.UsedCount + 1,
+				}
+				cols := []string{
+					"used_count",
+				}
+				if err := s.couponDAO.UpdateCoupon(&couponinfo, cols); err != nil {
+					utils.LogError("回填优惠券信息失败:", err)
+					return errors.New("回填优惠券信息失败！")
+				}
 			} else {
 				return errors.New("优惠券不可抵用商品")
 			}
@@ -161,39 +212,79 @@ func (s *GoodsServ) Orders(
 		couponAmount, _ := strconv.ParseFloat(info.CouponAmount, 64)
 		payMoney, _ := strconv.ParseFloat(info.Amount, 64)
 		payMoney = payMoney - couponAmount
-		if accMoney < payMoney {
-			return errors.New("账户余额不足")
-		}
-
-		info.ActualAmount = strconv.FormatFloat(payMoney, 'f', -1, 64)
-		if payMoney > 0 && couponAmount > 0 && info.PayType != models.CONSUME_INNER {
-			info.PayType = models.CONSUME_COUPON_COIN
-		}
 
 		// 如果是城币, 则插入用户账户消费记录
 		if payMoney > 0 {
-			if err := s.saveCustomerPayRec(account, info); err != nil {
-				return err
+			var leftPay = payMoney
+			vips, err := s.custDAO.GetValidVIPCards(info.UserId)
+			if err != nil {
+				return utils.LogError("查询用户 VIP卡 出错", err)
+			}
+
+			var vipAccount float64
+			if vips != nil && len(vips) > 0 {
+				for _, vip := range vips {
+					vipMoney, _ := strconv.ParseFloat(vip.Balance, 64)
+					vipAccount += vipMoney
+
+					// 当前扣款
+					var vipPay float64
+					if vipMoney > leftPay {
+						// 如果卡余额比 需要扣款的多, 那么就只扣这一张卡
+						// 通过 leftPay < 0.01 来判断
+						vipPay = leftPay
+						leftPay = 0
+					} else {
+						// 如果余额不够, 先扣掉本张卡余额, 继续循环
+						vipPay = vipMoney
+						leftPay -= vipMoney
+					}
+
+					if err := s.saveVipChangeRec(vipPay, &vip, &info.TaGoodsOrders); err != nil {
+						return utils.LogError("VIP卡扣款失败", err.Error())
+					}
+
+					if leftPay < 0.01 {
+						break
+					}
+				}
+			}
+			// 如果 VIP 卡余额不足, 则使用账户余额
+			if leftPay > 0.01 {
+				if leftPay > accMoney {
+					return errors.New("账户余额不足")
+				}
+
+				// 插入账户流水
+				if err := s.saveCustomerPayRec(leftPay, account, &info.TaGoodsOrders); err != nil {
+					utils.LogError("插入账户流水出错: " + err.Error())
+					return errors.New("写入账户流水出错")
+				}
 			}
 		}
 	}
 
-	// 保存主订单
-	if err := s.dao.SaveOrders(info); err != nil {
-		return err
+	// 更新订单
+	orders := info.TaGoodsOrders
+	orders.IsPay = models.BOOL_TRUE
+	orders.Status = models.STATUS_NORMAL
+	orders.Remark = info.Remark
+
+	if orders.ActualAmount == "" {
+		orders.ActualAmount = "0.0"
 	}
 
-	// 保存订单明细
-	if err := s.dao.SaveOrdersDetail(details, info.OrdersId); err != nil {
+	if orders.CouponAmount == "" {
+		orders.CouponAmount = "0.0"
+	}
+
+	if err := s.dao.UpdateOrders(&orders, []string{
+		"status", "is_pay", "coupon_amount", "actual_amount", "remark",
+	}); err != nil {
+		utils.LogError("修改订单状态失败：", err.Error())
 		return err
 	}
 
-	// 通知后端有新订单 - websocket
-	// orderList, err := s.GetOnLineOrders(info.CaseId, false)
-	// if err != nil {
-	// 	utils.LogError("获取新单列表出错: " + err.Error())
-	// 	return nil
-	// }
 	newOrder, err := s.GetNewGoods(info.OrdersId)
 	if err != nil {
 		// 下单流程已经结束, 不反馈错误
@@ -218,10 +309,12 @@ func (s *GoodsServ) Orders(
 }
 
 // saveCustomerPayRec 保存账户消费流水
-func (s *GoodsServ) saveCustomerPayRec(account *model.TaCustomerAccount, info *model.TaGoodsOrders) error {
+func (s *GoodsServ) saveCustomerPayRec(payMoney float64, account *model.TaCustomerAccount, info *model.TaGoodsOrders) error {
+	actAmount := strconv.FormatFloat(payMoney, 'f', -1, 64)
+
 	accBill := new(model.TaAccountChange)
 	accBill.AccountId = account.AccountId
-	accBill.Amount = info.ActualAmount
+	accBill.Amount = actAmount
 	accBill.CaseId = info.CaseId
 	accBill.ChangeSource = models.ACCSOURCE_GOODS_ORDERS
 	accBill.ChangeType = models.CONSUME_COINCHG
@@ -234,6 +327,26 @@ func (s *GoodsServ) saveCustomerPayRec(account *model.TaCustomerAccount, info *m
 	return s.custDAO.InsertAccountRecords(accBill)
 }
 
+// saveVipChangeRec 保存vip消费记录
+func (s *GoodsServ) saveVipChangeRec(payMoney float64, custVIP *model.TaCustomerVip, info *model.TaGoodsOrders) error {
+	vipChange := new(model.TaCustomerVipChange)
+	vipChange.CustomerVipId = custVIP.CustomerVipId
+	vipChange.CustomerId = info.UserId
+	vipChange.OrgId = info.OrgId
+	vipChange.CaseId = info.CaseId
+	vipChange.ChangeType = models.CONSUME_COINCHG
+	vipChange.FloatType = models.ACCOUNT_SPENT
+	vipChange.SourceId = info.OrdersId
+	vipChange.SourceName = "商品下单"
+	vipChange.Amount = strconv.FormatFloat(payMoney, 'f', -1, 64)
+
+	if err := s.vipDAO.InsertCustomerVipChange(*vipChange); err != nil {
+		return err
+	}
+
+	return s.custDAO.UpdateCustVipCardAmount(custVIP, payMoney)
+}
+
 // validOrdersInfo 校验下单内容
 // 没有对金额, 数量的关系进行校验
 func (s *GoodsServ) validOrdersInfo(info *model.TaGoodsOrders) error {
@@ -311,9 +424,6 @@ func (s *GoodsServ) validOrdersInfo(info *model.TaGoodsOrders) error {
 				if info.UserName == "" {
 					info.UserName = cust.CustomerName
 				}
-				// if ut.CaseId == caseID {
-
-				// }
 			}
 		}
 

service/luckdraw/luckdraw.go

@@ -2,10 +2,12 @@ package luckdraw
 
 import (
 	"errors"
+	"fmt"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/course"
 	"spaceofcheng/services/models/luckdraw"
 	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
 	"time"
 )
@@ -26,6 +28,283 @@ func NewLuckdrawServ(ctx *utils.Context) *LuckdrawServ {
 	}
 }
 
+// GetLuckDrawTpl 获取抽奖模板
+func (s *LuckdrawServ) GetLuckDrawTpl() ([]model.TaLuckdrawTpl, error) {
+	org := s.ctx.Get("org").(model.SysOrg)
+	tpls, err := s.dao.GetLuckDrawTpl(org.OrgId)
+	return tpls, err
+}
+
+// GetLuckDrawList 获取抽奖列表
+func (s *LuckdrawServ) GetLuckDrawList(caseids, name, status string, page, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	if page == 0 {
+		page = 1
+	}
+	list, err := s.dao.GetLuckDrawList(caseids, name, status, page, pageSize)
+	if err != nil {
+		utils.LogError("获取抽奖信息失败: " + err.Error())
+		return nil, errors.New("获取抽奖信息失败")
+	}
+	total, err := s.dao.GetLuckDrawCount(caseids, name, status)
+	if err != nil {
+		utils.LogError("获取抽奖信息失败: " + err.Error())
+		return nil, errors.New("获取抽奖信息失败")
+	}
+
+	return map[string]interface{}{
+		"list":     list,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, nil
+}
+
+// GetLuckDrawRecordList 获取抽奖记录列表
+func (s *LuckdrawServ) GetLuckDrawRecordList(luckdrawid, tel string, page, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	if page == 0 {
+		page = 1
+	}
+	list, err := s.dao.GetLuckDrawRecord(luckdrawid, tel, page, pageSize)
+	if err != nil {
+		utils.LogError("获取抽奖记录信息失败: " + err.Error())
+		return nil, errors.New("获取抽奖记录信息失败")
+	}
+	total, err := s.dao.GetLuckDrawRecordCount(luckdrawid, tel)
+	if err != nil {
+		utils.LogError("获取抽奖记录信息失败: " + err.Error())
+		return nil, errors.New("获取抽奖记录信息失败")
+	}
+
+	return map[string]interface{}{
+		"list":     list,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, nil
+}
+
+// GetLuckDrawShareList 获取抽奖分享记录列表
+func (s *LuckdrawServ) GetLuckDrawShareList(luckdrawid, tel string, page, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	if page == 0 {
+		page = 1
+	}
+	list, err := s.dao.GetLuckDrawShare(luckdrawid, tel, page, pageSize)
+	if err != nil {
+		utils.LogError("获取抽奖分享记录信息失败: " + err.Error())
+		return nil, errors.New("获取抽奖分享记录信息失败")
+	}
+	total, err := s.dao.GetLuckDrawShareCount(luckdrawid, tel)
+	if err != nil {
+		utils.LogError("获取抽奖分享记录信息失败: " + err.Error())
+		return nil, errors.New("获取抽奖分享记录信息失败")
+	}
+
+	return map[string]interface{}{
+		"list":     list,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, nil
+}
+
+// GetLuckDrawInfoByID 获取单个抽奖记录
+func (s *LuckdrawServ) GetLuckDrawInfoByID(luckdrawid string) (*luckdraw.LuckDrawInfo, error) {
+	info, err := s.dao.GetLuckDrawInfoByID(luckdrawid)
+	if err != nil {
+		utils.LogError("获取抽奖信息失败: " + err.Error())
+		return nil, errors.New("获取抽奖信息失败")
+	}
+	return info, nil
+}
+
+// SaveLuckDraw 保存抽奖信息
+func (s *LuckdrawServ) SaveLuckDraw(luckdraw *luckdraw.LuckDrawInfo) (*model.TaLuckdraw, error) {
+	if luckdraw.CaseId == "" {
+		return nil, utils.LogError("请选择所属案场！")
+	}
+	if luckdraw.Name == "" {
+		return nil, utils.LogError("请输入活动标题！")
+	}
+	if luckdraw.BeginDate.IsZero() || luckdraw.EndDate.IsZero() {
+		return nil, utils.LogError("请选择活动时间！")
+	}
+	if luckdraw.TplId == "" {
+		return nil, utils.LogError("请选择活动模板！")
+	}
+	if luckdraw.LuckdrawRule == "" {
+		return nil, utils.LogError("请填写规则说明！")
+	}
+	var newInfo *model.TaLuckdraw
+	var err error
+	if luckdraw.Id == "" {
+		org := s.ctx.Get("org").(model.SysOrg)
+		luckdraw.OrgId = org.OrgId
+		user := s.ctx.Get("user").(model.SysUser)
+		luckdraw.CreateUser = user.UserId
+		newInfo, err = s.dao.InsertLuckdraw(luckdraw.TaLuckdraw)
+		if err != nil {
+			utils.LogError("保存抽奖信息失败: " + err.Error())
+			return nil, errors.New("保存抽奖信息失败")
+		}
+	} else {
+		if luckdraw.JoinedNum > 0 {
+			var cols = []string{
+				"name",
+				"luckdraw_rule",
+				"remark",
+			}
+			err = s.dao.UpdateLuckDraw(luckdraw.TaLuckdraw, cols)
+			if err != nil {
+				utils.LogError("更新抽奖信息失败: " + err.Error())
+				return nil, errors.New("更新抽奖信息失败")
+			}
+
+			err = s.dao.UpdatePrizeDesc(luckdraw.Prizes)
+			if err != nil {
+				utils.LogError("更新抽奖信息失败: " + err.Error())
+				return nil, errors.New("更新抽奖信息失败")
+			}
+			return &luckdraw.TaLuckdraw, nil
+		}
+		var cols = []string{
+			"name",
+			"tpl_id",
+			"luckdraw_rule",
+			"begin_date",
+			"end_date",
+			"case_id",
+			"remark",
+			"join_num",
+			"join_type",
+			"num_type",
+			"num_interval",
+			"luckdraw_num",
+			"share_type",
+			"share_add_num",
+			"is_sys_luckdraw",
+			"is_internal_default"}
+		err = s.dao.UpdateLuckDraw(luckdraw.TaLuckdraw, cols)
+		if err != nil {
+			utils.LogError("更新抽奖信息失败: " + err.Error())
+			return nil, errors.New("更新抽奖信息失败")
+		}
+		newInfo = &luckdraw.TaLuckdraw
+		// 删除奖品内定信息
+		err = s.dao.DelLuckDrawDefault(luckdraw.Id)
+		if err != nil {
+			utils.LogError("删除抽奖内定信息失败: " + err.Error())
+			return nil, errors.New("更新抽奖信息失败")
+		}
+		// 删除抽奖图片信息
+		err = s.dao.DelLuckDrawImgs(luckdraw.Id)
+		if err != nil {
+			utils.LogError("删除抽奖图片信息失败: " + err.Error())
+			return nil, errors.New("更新抽奖信息失败")
+		}
+		// 删除奖品信息
+		err = s.dao.DelLuckDrawPrize(luckdraw.Id)
+		if err != nil {
+			utils.LogError("删除奖品信息失败: " + err.Error())
+			return nil, errors.New("更新奖品信息失败")
+		}
+
+		// 删除该抽奖对应的设置信息
+		err = s.dao.DelLuckDrawSet(luckdraw.Id)
+		if err != nil {
+			utils.LogError("删除奖品信息失败: " + err.Error())
+			return nil, errors.New("更新奖品信息失败")
+		}
+	}
+
+	// 保存抽奖图片信息
+	err = s.dao.SaveLuckDrawImgs(luckdraw.Imgs, newInfo.Id)
+	if err != nil {
+		utils.LogError("保存抽奖图片信息失败: " + err.Error())
+		return nil, errors.New("保存抽奖图片信息失败")
+	}
+
+	// 保存奖品信息
+	err = s.dao.SaveLuckDrawPrizes(luckdraw.Prizes, newInfo)
+	if err != nil {
+		utils.LogError("保存奖品信息失败: " + err.Error())
+		return nil, errors.New("保存奖品信息失败：" + err.Error())
+	}
+	return newInfo, nil
+}
+
+// OpenLuckDraw 启动游戏
+func (s *LuckdrawServ) OpenLuckDraw(id string) error {
+	ld, err := s.dao.GetLuckDrawByID(id)
+	if err != nil {
+		utils.LogError("获取游戏信息失败: " + err.Error())
+		return errors.New("获取游戏信息失败")
+	}
+	if ld.Status != models.STATUS_READY {
+		return errors.New("游戏状态异常，请刷新后重试！")
+	}
+	var luckdraw = model.TaLuckdraw{
+		Id:     id,
+		Status: models.STATUS_NORMAL,
+	}
+	err = s.dao.UpdateLuckDraw(luckdraw, []string{
+		"status",
+	})
+	return err
+}
+
+// StopLuckDraw 暂停游戏
+func (s *LuckdrawServ) StopLuckDraw(id string) error {
+	// 判断
+	ld, err := s.dao.GetLuckDrawByID(id)
+	if err != nil {
+		utils.LogError("获取游戏信息失败: " + err.Error())
+		return errors.New("获取游戏信息失败")
+	}
+	if ld.Status != models.STATUS_NORMAL {
+		return errors.New("游戏状态异常，请刷新后重试！")
+	}
+
+	var luckdraw = model.TaLuckdraw{
+		Id:     id,
+		Status: models.STATUS_READY,
+	}
+	err = s.dao.UpdateLuckDraw(luckdraw, []string{
+		"status",
+	})
+	return err
+}
+
+// DelLuckDraw 删除游戏
+func (s *LuckdrawServ) DelLuckDraw(id string) error {
+	// 判断
+	ld, err := s.dao.GetLuckDrawByID(id)
+	if err != nil {
+		utils.LogError("获取游戏信息失败: " + err.Error())
+		return errors.New("获取游戏信息失败")
+	}
+	if ld.Status != models.STATUS_READY {
+		return errors.New("游戏状态异常，请刷新后重试！")
+	}
+	var luckdraw = model.TaLuckdraw{
+		Id:     id,
+		Status: models.STATUS_DEL,
+	}
+	err = s.dao.UpdateLuckDraw(luckdraw, []string{
+		"status",
+	})
+	return err
+}
+
+// GetLuckDraw 获取抽奖信息
 func (s *LuckdrawServ) GetLuckDraw(id string) (*luckdraw.LuckDraw, error) {
 	luck, err := s.dao.GetLuckDraw(id)
 	if err != nil {
@@ -34,6 +313,7 @@ func (s *LuckdrawServ) GetLuckDraw(id string) (*luckdraw.LuckDraw, error) {
 	return luck, nil
 }
 
+// LuckDraw 抽奖
 func (s *LuckdrawServ) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuckdrawPrize, *model.TaPrizeDetail, error) {
 	prize, prizeDetail, recored, err := s.dao.LuckDraw(id, user)
 	if err != nil {
@@ -56,6 +336,40 @@ func (s *LuckdrawServ) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuc
 		return nil, nil, errors.New("写入中奖二维码失败")
 	}
 
+	if prize.IsReality == models.BOOL_TRUE {
+		// 推送微信消息
+		userMap := s.ctx.Get("userMap").(model.TaUserMapping)
+		clienturl := s.ctx.Get("clienturl").(string)
+		tplID := s.ctx.Get("tplid").(string)
+
+		cs, err := models.GetCaseByID(recored.CaseId)
+		if err != nil {
+			utils.LogError("推送微信消息失败, 查询案场信息出错: " + err.Error())
+			// 但是不返回错误
+			return nil, nil, nil
+		}
+
+		caseName := cs.CaseName
+		remarkTpl := "请在%s日前, 前往%s兑换"
+
+		message := utils.Message{
+			To: utils.ClientID{ID: userMap.Openid},
+			Data: map[string]interface{}{
+				"orgid": recored.OrgId,
+				"tplid": tplID,
+				"link":  clienturl,
+				"data": map[string]string{
+					"first":    "中奖成功提醒",
+					"keyword1": prize.PrizeName,
+					"keyword2": time.Now().Local().Format("2006-01-02"),
+					"remark":   fmt.Sprintf(remarkTpl, recored.VerificationEnd.Format("2006-01-02"), caseName),
+				},
+			},
+		}
+
+		go utils.SendWechat(message)
+	}
+
 	return prize, prizeDetail, nil
 }
 
@@ -194,13 +508,20 @@ func (s *LuckdrawServ) GetUserRecordByLuckDraw(userid string, luckdrawid string)
 	return record, nil
 }
 
-func (s *LuckdrawServ) GetUserLuckDrawByLuckDraw(userid string, luckdrawid string) (*model.TaLuckdrawRecord, error) {
-	record, err := s.dao.GetUserLuckDrawByLuckDraw(userid, luckdrawid)
+// GetUserLuckDrawByLuckDraw 获取用户抽奖信息
+func (s *LuckdrawServ) GetUserLuckDrawByLuckDraw(user model.TaCustomer, luckdrawid string) (*model.TaLuckdrawRecord, *model.TaLuckdrawCustomer, error) {
+	// 获取用户抽奖设置信息
+	customerSet, err := s.dao.GetUserLuckDrawSet(user, luckdrawid)
+	if err != nil {
+		utils.LogError("获取用户抽奖设置失败: " + err.Error())
+		return nil, nil, errors.New("获取用户抽奖设置失败")
+	}
+	record, err := s.dao.GetUserLuckDrawByLuckDraw(user.CustomerId, luckdrawid)
 	if err != nil {
 		utils.LogError("获取用户的抽奖信息失败: " + err.Error())
-		return nil, errors.New("获取用户的抽奖信息失败")
+		return nil, nil, errors.New("获取用户的抽奖信息失败")
 	}
-	return record, nil
+	return record, customerSet, nil
 }
 
 func (s *LuckdrawServ) GetDetailByRecord(recordid string) (*model.TaPrizeDetail, error) {
@@ -267,3 +588,9 @@ func (s *LuckdrawServ) GetLuckDrawShareData(luckID, from, to, caseID string) ([]
 	}
 	return share, nil
 }
+
+// UpdateShareNum 更新抽奖次数
+func (s *LuckdrawServ) UpdateShareNum(luckdraw *luckdraw.LuckDraw, fromid string) error {
+	err := s.dao.UpdateShareNum(luckdraw, fromid)
+	return err
+}

service/marketing/marketing.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/card"
 	"spaceofcheng/services/models/coupon"
 	"spaceofcheng/services/models/marketing"
 	"spaceofcheng/services/models/model"
@@ -11,6 +12,7 @@ import (
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/service/events"
 	"spaceofcheng/services/utils"
+	"strings"
 
 	"github.com/astaxie/beego"
 )
@@ -22,6 +24,7 @@ type MarketingServ struct {
 	wdao      *marketing.WorkDAO
 	userdao   *system.UserDAO
 	couponDAO *coupon.CouponDAO
+	cardDAO   *card.CardDAO
 }
 
 // NewMarketingServ 初始化
@@ -32,6 +35,7 @@ func NewMarketingServ(ctx *utils.Context) *MarketingServ {
 		wdao:      marketing.NewWorkDAO(ctx),
 		userdao:   system.NewUserDAO(ctx),
 		couponDAO: coupon.NewCouponDAO(ctx),
+		cardDAO:   card.NewCardDAO(ctx),
 	}
 }
 
@@ -67,7 +71,7 @@ func (s *MarketingServ) GetMarketingList(caseids string, page int, pageSize int)
  */
 func (s *MarketingServ) SaveMarketing(activity model.SysActivity, activeType, resourceDesc string) (*model.SysActivity, *model.SysActivityAction, error) {
 	res := make(map[string]interface{})
-	if err := json.Unmarshal([]byte(resourceDesc), &res); err != nil {
+	if err := json.Unmarshal([]byte(strings.Replace(resourceDesc, "\n", "\\n", -1)), &res); err != nil {
 		utils.LogError("校验活动数据失败: " + err.Error())
 		return nil, nil, errors.New("校验活动数据失败")
 	}
@@ -96,18 +100,25 @@ func (s *MarketingServ) SaveMarketing(activity model.SysActivity, activeType, re
 		// 	return nil, nil, errors.New("赠送数量不能大于卡券总数的数量")
 		// }
 	}
+	if activeType == events.ActGiveCard {
+		cardID := res["giftValue"].(string)
+		if cardID == "" {
+			return nil, nil, errors.New("未指定赠送卡内容")
+		}
+	}
 
 	var newInfo *model.SysActivity
 	var newWoke *model.SysActivityAction
 
-	user := s.ctx.Get("user").(model.SysUser)
+	// user := s.ctx.Get("user").(model.SysUser)
 
-	caseinfo, err := s.userdao.GetUserBelongCase(user.UserId)
-	if err != nil {
-		return nil, nil, err
-	}
-	activity.CaseId = caseinfo.CaseId
+	// caseinfo, err := s.userdao.GetUserBelongCase(user.UserId)
+	// if err != nil {
+	// 	return nil, nil, err
+	// }
+	// activity.CaseId = caseinfo.CaseId
 	// 存储 营销活动
+	var err error
 	newInfo, err = s.dao.AddMarketing(activity)
 	if err != nil {
 		return nil, nil, err
@@ -118,7 +129,7 @@ func (s *MarketingServ) SaveMarketing(activity model.SysActivity, activeType, re
 	woke.ActiveType = activeType
 	woke.ResourceDesc = resourceDesc
 	woke.ResourceType = "占位符"
-
+	woke.ResourceId = res["giftValue"].(string)
 	// 存储 活动动作
 	newWoke, err = s.wdao.AddWork(woke)
 	if err != nil {
@@ -126,7 +137,7 @@ func (s *MarketingServ) SaveMarketing(activity model.SysActivity, activeType, re
 	}
 
 	// 重启事件
-	events.ListenAllEvent(activity.OrgId, activity.CaseId)
+	events.ListenAllEvent(newInfo.OrgId, newInfo.CaseId)
 
 	return newInfo, newWoke, err
 }
@@ -225,3 +236,12 @@ func (s *MarketingServ) UpdateMarketing(activity model.SysActivity) error {
 	err := s.dao.UpdateMarketing(activity)
 	return err
 }
+
+func (s *MarketingServ) GetUserCases(caseId string) ([]model.SysCase, error) {
+	cases, err := s.dao.GetUserCases(caseId)
+	if err != nil {
+		utils.LogError("获取用户案场失败: " + err.Error())
+		return nil, errors.New("获取用户案场失败")
+	}
+	return cases, nil
+}

service/sys.go

@@ -182,7 +182,6 @@ func (s *SysServ) authWechat(gctx *context.Context) map[string]interface{} {
 
 		// 获取 token
 		token, err := s.getToken(gctx)
-		utils.LogError("token:", token)
 		if err != nil {
 			tokenStr := s.ctx.Get("token").(string)
 			if tokenStr != "" {

service/user.go

@@ -70,7 +70,12 @@ func (s *UserServ) GetUserList(username, typeid, caseids string, page int, pageS
 // GetCurrentEnvVars 获取当前环境相关变量
 func (s *UserServ) GetCurrentEnvVars() (map[string]interface{}, error) {
 	// 当前用户信息
-	user := s.ctx.Get("user").(model.SysUser)
+	userRaw := s.ctx.Get("user")
+	if userRaw == nil {
+		return nil, utils.LogError("无有效用户信息")
+	}
+
+	user := userRaw.(model.SysUser)
 	user.Pwd = ""
 	// 当前用户案场
 	sessionCase := s.ctx.Get("cases").([]model.SysUserCase)
@@ -89,14 +94,13 @@ func (s *UserServ) GetCurrentEnvVars() (map[string]interface{}, error) {
 	// 当前用户角色
 	roles, err := s.dao.GetUserRole(user.UserId)
 	if err != nil {
-		beego.Error(err)
-		return nil, err
+		return nil, utils.LogError(err)
 	}
 	// 当前用户菜单
 	menus, err := s.dao.GetUserMenu(user.UserId)
 	if err != nil {
 		beego.Error(err)
-		return nil, err
+		return nil, utils.LogError(err)
 	}
 
 	rtn := map[string]interface{}{
@@ -117,28 +121,29 @@ func (s *UserServ) GetUserByID(userid string) (*system.UserInfo, error) {
 		beego.Error(err)
 		return nil, err
 	}
-	userinfo.Pwd = ""
-	usertype, err := s.dao.GetUserType(userid)
-	if err != nil {
-		beego.Error(err)
-		return nil, err
-	}
-	userinfo.UserType = usertype
+	if userinfo != nil {
+		userinfo.Pwd = ""
+		usertype, err := s.dao.GetUserType(userid)
+		if err != nil {
+			beego.Error(err)
+			return nil, err
+		}
+		userinfo.UserType = usertype
 
-	usertag, err := s.dao.GetUserTag(userid)
-	if err != nil {
-		beego.Error(err)
-		return nil, err
-	}
-	userinfo.UserTag = usertag
+		usertag, err := s.dao.GetUserTag(userid)
+		if err != nil {
+			beego.Error(err)
+			return nil, err
+		}
+		userinfo.UserTag = usertag
 
-	usercase, err := s.dao.GetUserCase(userid)
-	if err != nil {
-		beego.Error(err)
-		return nil, err
+		usercase, err := s.dao.GetUserCase(userid)
+		if err != nil {
+			beego.Error(err)
+			return nil, err
+		}
+		userinfo.UserCase = usercase
 	}
-	userinfo.UserCase = usercase
-
 	// userrole, err := s.dao.GetUserRole(userid)
 	// if err != nil {
 	// 	return nil, err
@@ -169,6 +174,22 @@ func (s *UserServ) SaveUser(user system.SysUserForm) (*model.SysUser, error) {
 	userInfo.Email = user.Email
 	userInfo.Phone = user.Phone
 	userInfo.Headimgurl = user.Headimgurl
+	var flag bool = true
+	for i := 0; i < 4; i++ {
+		code := s.dao.GenerateRecommendCode()
+		i, err := s.dao.IsCodeExist(code)
+		if err != nil {
+			return nil, errors.New("生成推荐码失败！请重新点击保存。")
+		}
+		if i <= 0 {
+			userInfo.RecommendCode = code
+			flag = false
+			break
+		}
+	}
+	if flag {
+		return nil, errors.New("生成推荐码失败！请重新点击保存。")
+	}
 
 	org := s.ctx.Get("org").(model.SysOrg)
 	user.OrgId = org.OrgId
@@ -232,6 +253,14 @@ func (s *UserServ) SaveUser(user system.SysUserForm) (*model.SysUser, error) {
 		}
 		newUSer = &userInfo
 	} else {
+		l, err := s.dao.IsCodeExist(userInfo.RecommendCode)
+		if err != nil {
+			beego.Error(err)
+			return nil, err
+		}
+		if l > 0 {
+			return nil, errors.New("此推荐码已被使用！")
+		}
 		newUSer, err = s.dao.AddUser(userInfo)
 		if err != nil {
 			beego.Error(err)
@@ -420,7 +449,7 @@ func (s *UserServ) SaveUserRole(userid, roleids string) error {
 }
 
 // GetUserCustomer 获取我的推荐客户
-func (s *UserServ) GetUserCustomer(userid, isrecommend, key string, page int, pageSize int) ([]model.TaCustomer, error) {
+func (s *UserServ) GetUserCustomer(userid, isrecommend, key string, page int, pageSize int) ([]system.CustomerInfo, error) {
 	if pageSize == 0 {
 		pageSize = PAGENUM
 	}

service/vipcard/vipcard.go

@@ -85,6 +85,10 @@ func (s *VipcardServ) AddVipCard(vipCard model.TaVipCard) (*model.TaVipCard, err
 		vipChild.VipCardId = vipcard.VipCardId
 		vipChild.VipCardChildCode = s.dao.GenerateChildCode()
 		vipChild.Amount = vipCard.CardAmount
+		vipChild.BeginDate = vipCard.BeginDate
+		vipChild.EndDate = vipCard.EndDate
+		vipChild.CaseId = vipCard.CaseId
+		vipChild.OrgId = vipCard.OrgId
 		_, err := s.dao.AddVipChildCard(vipChild)
 		if err != nil {
 			utils.LogError("创建VIP卡失败: " + err.Error())
@@ -103,6 +107,56 @@ func (s *VipcardServ) FindCustomerByTel(tel string) (*model.TaCustomer, error) {
 	return customer, err
 }
 
+// SaveCustomerVip 保存用户vip
+func (s *VipcardServ) SaveCustomerVip(vipchild *model.TaVipCardChild, createUser model.SysUser) error {
+	customer, err := s.cdao.GetCustomerByPhone(vipchild.CustomerTel)
+	if err != nil {
+		utils.LogError("激活失败: " + err.Error())
+		return errors.New("激活失败")
+	}
+	var customerVip = model.TaCustomerVip{
+		CustomerId:     customer.CustomerId,
+		VipCardId:      vipchild.VipCardId,
+		VipCardChildId: vipchild.VipCardChildId,
+		CustomerTel:    customer.Phone,
+		Amount:         vipchild.Amount,
+		BeginDate:      vipchild.BeginDate,
+		EndDate:        vipchild.EndDate,
+		Balance:        vipchild.Amount,
+		CaseId:         vipchild.CaseId,
+		OrgId:          vipchild.OrgId,
+		SalesId:        vipchild.SalesId,
+		SalesName:      vipchild.SalesName,
+		PayAmount:      "0",
+	}
+	info, err := s.dao.AddCustomerVip(customerVip)
+	if err != nil {
+		utils.LogError("保存用户vip卡失败: " + err.Error())
+		return errors.New("激活失败")
+	}
+	// vip卡明细操作
+	var change = model.TaCustomerVipChange{
+		CustomerVipId: info.CustomerVipId,
+		CustomerId:    info.CustomerId,
+		OrgId:         info.OrgId,
+		CaseId:        info.CaseId,
+		ChangeType:    models.CONSUME_COINCHG,
+		ChangeSource:  models.ACCSOURCE_RECHARGE,
+		SourceId:      vipchild.VipCardChildId,
+		SourceName:    "充值",
+		Amount:        info.Amount,
+		FloatType:     models.ACCOUNT_INCOME,
+		CreateUser:    createUser.UserId,
+	}
+	err = s.dao.InsertCustomerVipChange(change)
+	if err != nil {
+		utils.LogError("保存用户vip卡明细信息失败: " + err.Error())
+		return errors.New("激活失败")
+	}
+
+	return err
+}
+
 // CustomerCharge 给用户充值
 func (s *VipcardServ) CustomerCharge(vipchild *model.TaVipCardChild, createUser model.SysUser) error {
 	customer, err := s.cdao.GetCustomerByPhone(vipchild.CustomerTel)
@@ -141,17 +195,26 @@ func (s *VipcardServ) CustomerCharge(vipchild *model.TaVipCardChild, createUser
 	return nil
 }
 
-
 // GetVipChildExcel 获取VIP卡列表
 func (s *VipcardServ) GetVipChildExcel(caseids, cardNo, sellerName, userName string) ([]vipcard.VipChild, error) {
-	
+
 	vipchild, err := s.dao.GetVipCardListExcel(caseids, cardNo, sellerName, userName)
 	if err != nil {
 		utils.LogError("获取VIP卡信息失败: " + err.Error())
 		return nil, errors.New("获取VIP卡信息失败")
 	}
-	
+
 	return vipchild, err
 }
 
+// GetCustomerVips 获取用户vip卡信息
+func (s *VipcardServ) GetCustomerVips() ([]vipcard.CustomerVipWithChange, error) {
+	customer := s.ctx.Get("customer").(model.TaCustomer)
+	vips, err := s.dao.GetCustomerVips(customer.CustomerId)
+	if err != nil {
+		utils.LogError("获取VIP卡信息失败: " + err.Error())
+		return nil, errors.New("获取VIP卡信息失败")
+	}
 
+	return vips, err
+}

tests/cases_test.go

@@ -0,0 +1,46 @@
+package tests
+
+import (
+	"net/http"
+	"net/url"
+	"spaceofcheng/services/controllers"
+	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestGetCmsCaseList(t *testing.T) {
+
+	Convey("获取案场列表", t, func() {
+		Convey("正常业务", func() {
+			params := url.Values{}
+			params.Add("orgid", "1")
+
+			result := &controllers.JSONMessage{}
+
+			code, _, err := NewRequestMock().Request(http.MethodGet, "/api/guest/MQ/cms/case", params, result)
+
+			// http 常规判断, 可以省略
+			So(code, ShouldEqual, http.StatusOK)
+			So(err, ShouldBeNil)
+
+			// 业务返回判断
+			So(result.Code, ShouldEqual, http.StatusOK)
+			So(result.Result, ShouldNotBeEmpty)
+		})
+
+		Convey("机构不传报错", func() {
+			result := &controllers.JSONMessage{}
+
+			code, _, err := NewRequestMock().Request(http.MethodGet, "/api/guest/MQ/cms/case", nil, result)
+
+			// http 常规判断, 可以省略
+			So(code, ShouldEqual, http.StatusOK)
+			So(err, ShouldBeNil)
+
+			// 业务返回判断
+			So(result.Code, ShouldNotEqual, http.StatusOK)
+		})
+
+	})
+}

tests/courseorder_test.go

@@ -0,0 +1,74 @@
+package tests
+
+import (
+	"net/http"
+	"net/url"
+	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/utils"
+	"testing"
+	"time"
+
+	"github.com/astaxie/beego"
+
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestPreCourseOrder(t *testing.T) {
+	Convey("课程下单", t, func() {
+
+		Convey("正常下单", func() {
+			params := url.Values{}
+			params.Add("info", `{"CourseId":"ecc55f91-52b4-4e9b-89a8-b9b3362730f9","CaseId":"10","Price":"2.00"}`)
+			result := &controllers.JSONMessage{}
+			api := "/api/wechat/MQ/order/course"
+
+			token := &utils.JWTToken{
+				Guest:   false,
+				ID:      "oMOpz0kgTrasoAA3G70R7phomn1g", // openid
+				Expire:  time.Now().Local().Add(24 * 30 * time.Hour),
+				BatchNo: "",
+			}
+
+			code, _, err := NewRequestMock().
+				AddToken(token.ToMap()).
+				AddWechatUA().
+				Request(http.MethodPost, api, params, result)
+
+			beego.Trace(result)
+
+			So(code, ShouldEqual, http.StatusOK)
+			So(err, ShouldBeNil)
+
+			// 业务返回判断
+			So(result.Code, ShouldEqual, http.StatusOK)
+			So(result.Result, ShouldNotBeEmpty)
+
+			orderID := result.Result.(map[string]interface{})["OrdersId"].(string)
+
+			Convey("下单确认", func() {
+				result := &controllers.JSONMessage{}
+				api := "/api/wechat/MQ/order/course/" + orderID
+
+				token := &utils.JWTToken{
+					Guest:   false,
+					ID:      "oMOpz0kgTrasoAA3G70R7phomn1g", // openid
+					Expire:  time.Now().Local().Add(24 * 30 * time.Hour),
+					BatchNo: "",
+				}
+
+				code, _, err := NewRequestMock().
+					AddToken(token.ToMap()).
+					AddWechatUA().
+					Request(http.MethodPut, api, nil, result)
+
+				beego.Trace(result)
+
+				So(code, ShouldEqual, http.StatusOK)
+				So(err, ShouldBeNil)
+
+				// 业务返回判断
+				So(result.Code, ShouldEqual, http.StatusOK)
+			})
+		})
+	})
+}

tests/goodsorder_test.go

@@ -0,0 +1,70 @@
+package tests
+
+import (
+	"net/http"
+	"net/url"
+	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/utils"
+	"testing"
+	"time"
+
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestPreGoodsOrder(t *testing.T) {
+	Convey("商品下单", t, func() {
+
+		Convey("正常下单", func() {
+			params := url.Values{}
+			params.Add("info", `{"CaseId":"1","AreaId":"12","AreaName":"吧台","TableId":"28","TableNo":"城咖啡水吧台","Amount":"23","OrdersNum":1,"Remark":"","OrgId":"1","UserName":"奥利奥","PayType":"coupon"}`)
+			params.Add("detail", `[{"GoodsId":"61","GoodsName":"美式","SpecId":"40","SpecName":"去冰","Number":1,"Price":"23"}]`)
+
+			result := &controllers.JSONMessage{}
+			api := "/api/wechat/MQ/order/goods"
+
+			token := &utils.JWTToken{
+				Guest:   false,
+				ID:      "oMOpz0kgTrasoAA3G70R7phomn1g", // openid
+				Expire:  time.Now().Local().Add(24 * 30 * time.Hour),
+				BatchNo: "",
+			}
+
+			code, _, err := NewRequestMock().
+				AddToken(token.ToMap()).
+				AddWechatUA().
+				Request(http.MethodPost, api, params, result)
+
+			So(code, ShouldEqual, http.StatusOK)
+			So(err, ShouldBeNil)
+
+			// 业务返回判断
+			So(result.Code, ShouldEqual, http.StatusOK)
+			So(result.Result, ShouldNotBeEmpty)
+
+			orderID := result.Result.(map[string]interface{})["OrdersId"].(string)
+
+			Convey("下单确认", func() {
+				result := &controllers.JSONMessage{}
+				api := "/api/wechat/MQ/order/goods/" + orderID
+
+				token := &utils.JWTToken{
+					Guest:   false,
+					ID:      "oMOpz0kgTrasoAA3G70R7phomn1g", // openid
+					Expire:  time.Now().Local().Add(24 * 30 * time.Hour),
+					BatchNo: "",
+				}
+
+				code, _, err := NewRequestMock().
+					AddToken(token.ToMap()).
+					AddWechatUA().
+					Request(http.MethodPut, api, nil, result)
+
+				So(code, ShouldEqual, http.StatusOK)
+				So(err, ShouldBeNil)
+
+				// 业务返回判断
+				So(result.Code, ShouldEqual, http.StatusOK)
+			})
+		})
+	})
+}

tests/tests.go

@@ -0,0 +1,27 @@
+package tests
+
+/**
+*
+* 使用的测试框架为  http://labix.org/gocheck
+*
+**/
+
+import (
+	"spaceofcheng/services/bootstrap"
+	"spaceofcheng/services/utils"
+	"testing"
+
+	"github.com/astaxie/beego"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestHelloWorld(t *testing.T) {
+	Convey("Hello go tester !", t, func() {
+		So(2, ShouldEqual, 2)
+	})
+}
+
+func init() {
+	bootstrap.SystemInit()
+	beego.TestBeegoInit(utils.GetAppRoot())
+}

tests/utils.go

@@ -0,0 +1,231 @@
+package tests
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"mime/multipart"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"os"
+	"spaceofcheng/services/utils"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/astaxie/beego"
+)
+
+// RequestMock 模拟请求
+type RequestMock struct {
+	Headers map[string]string
+	Host    string
+}
+
+// NewRequestMock new inst
+func NewRequestMock() *RequestMock {
+	return &RequestMock{
+		Headers: make(map[string]string),
+	}
+}
+
+// SetHeaders 设置自定义请求头
+func (t *RequestMock) SetHeaders(headers map[string]string) *RequestMock {
+	if headers != nil {
+		for k, v := range headers {
+			t.Headers[k] = v
+		}
+	}
+
+	return t
+}
+
+// AddWechatUA 添加微信UA
+func (t *RequestMock) AddWechatUA() *RequestMock {
+	t.Headers["User-Agent"] = "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Mobile/12A365 MicroMessenger/5.4.1 NetType/WIFI"
+	return t
+}
+
+// AddToken 添加Token
+func (t *RequestMock) AddToken(dt map[string]interface{}) *RequestMock {
+	token, _ := utils.CreateToken(dt)
+	t.Headers[utils.TokenHeader] = utils.TokenSchema + " " + token
+	return t
+}
+
+// SetHost 设置 host 包含 port
+func (t *RequestMock) SetHost(host string) *RequestMock {
+	t.Host = host
+	return t
+}
+
+// Request 请求
+// 暂时只支持 params 是 url.Values 及 map[string]interface{} 两种类型
+// url.Values 将被理解为 content-type="application/x-www-form-urlencoded"
+// map[string]interface{} 将被理解为 content-type="multipart/form-data"
+func (t *RequestMock) Request(meth, addr string, params interface{}, result interface{}) (code int, body []byte, err error) {
+	var r *http.Request
+	defer t.SetHeaders(nil)
+
+	code = 0
+	body = nil
+	err = nil
+
+	if t.Host != "" {
+		addr = t.Host + addr
+	} else {
+		addr = "http://127.0.0.1:8080" + addr
+	}
+
+	switch meth {
+
+	// get 请求, 只支持 params 为 url.Values 的参数
+	case http.MethodGet:
+		if params != nil {
+			if dt, ok := params.(url.Values); ok {
+				searchStr := dt.Encode()
+				if strings.Index(addr, "?") > -1 {
+					searchStr = "&" + searchStr
+				} else {
+					searchStr = "?" + searchStr
+				}
+				r, _ = http.NewRequest(meth, addr+searchStr, nil)
+			}
+		} else {
+			r, _ = http.NewRequest(meth, addr, nil)
+		}
+
+	// post, put, delete
+	case http.MethodPost, http.MethodPut, http.MethodDelete:
+		rb, ct, e := GetBody(params)
+		if e != nil {
+			err = e
+			return
+		}
+
+		r, _ = http.NewRequest(meth, addr, rb)
+		if ct != "" {
+			r.Header.Set("Content-Type", ct)
+		}
+
+	// 其他的本系统没有使用
+	default:
+		err = errors.New("不支持的请求类型")
+		return
+	}
+
+	// 自定义的 header 头
+	if t.Headers != nil {
+		for k, v := range t.Headers {
+			r.Header.Set(k, v)
+		}
+	}
+
+	w := httptest.NewRecorder()
+	beego.BeeApp.Handlers.ServeHTTP(w, r)
+
+	code = w.Code
+	body, _ = ioutil.ReadAll(w.Result().Body)
+
+	beego.Trace("testing", meth+" - "+addr)
+
+	if result != nil {
+		err = json.Unmarshal(body, result)
+		return
+	}
+
+	return
+}
+
+func GetBody(params interface{}) (body io.Reader, contentType string, err error) {
+	body = nil
+	contentType = ""
+	err = nil
+
+	if params == nil {
+		return
+	}
+
+	t := fmt.Sprintf("%T", params)
+	switch t {
+
+	// 被会解析为 application/x-www-form-urlencoded
+	case "url.Values":
+		data, _ := params.(url.Values)
+		body = strings.NewReader(data.Encode())
+		contentType = "application/x-www-form-urlencoded"
+		return
+
+	// 被会解析为 multipart/form-data
+	case "map[string]interface {}":
+		var b bytes.Buffer
+		var fw io.Writer
+
+		w := multipart.NewWriter(&b)
+		data, _ := params.(map[string]interface{})
+
+		// 遍历字段
+		for k, v := range data {
+			switch x := v.(type) {
+
+			// 文件
+			case *os.File:
+				if fw, err = w.CreateFormFile(k, x.Name()); err != nil {
+					return
+				}
+
+				if _, err = io.Copy(fw, x); err != nil {
+					return
+				}
+
+			// 字符串
+			case string:
+				err = w.WriteField(k, x)
+				if err != nil {
+					return
+				}
+
+			// 整数, 暂不支持 int 各种原始类型, 比如 int32, int64 等
+			case int:
+				dt := strconv.Itoa(x)
+				err = w.WriteField(k, dt)
+				if err != nil {
+					return
+				}
+
+			// 小数, 暂时不支持其他类型的浮点数
+			case float64:
+				dt := strconv.FormatFloat(x, 'f', -1, 64)
+				err = w.WriteField(k, dt)
+				if err != nil {
+					return
+				}
+
+			// 时间
+			case time.Time:
+				dt := x.Format("2006-01-02 15:04:05")
+				err = w.WriteField(k, dt)
+				if err != nil {
+					return
+				}
+
+			// 其他
+			default:
+				err = fmt.Errorf("暂时不支持 key "+k+" 对应的数据类型 %T", x)
+				return
+			}
+		}
+
+		body = bytes.NewReader(b.Bytes())
+		contentType = w.FormDataContentType()
+		return
+
+	default:
+		err = fmt.Errorf("暂时不支持的参数类型 " + t)
+		return
+	}
+}

utils/captcha.go

@@ -19,7 +19,7 @@ type CaptchaEngine struct {
 	capList map[string]cap
 }
 
-var capEngine *CaptchaEngine
+var capEngine = NewCaptchaEngine()
 
 // NewCaptchaEngine 创建验证码引擎
 func NewCaptchaEngine() *CaptchaEngine {
@@ -108,7 +108,3 @@ func (c *CaptchaEngine) DestoryCaptcha(phone string) {
 	// 如果成功, 则注销
 	delete(c.capList, phone)
 }
-
-func init() {
-	capEngine = NewCaptchaEngine()
-}

utils/configer.go

@@ -0,0 +1,15 @@
+package utils
+
+import (
+	"github.com/astaxie/beego/config"
+)
+
+// GetConfiger 获取配置
+func GetConfiger(file string) (config.Configer, error) {
+	conf, err := config.NewConfig("ini", file)
+	if err != nil {
+		return nil, LogError("读取配置文件失败", err.Error())
+	}
+
+	return conf, nil
+}

utils/log.go

@@ -9,8 +9,7 @@ import (
 	"github.com/astaxie/beego/logs"
 )
 
-var defaultLogger *logs.BeeLogger
-var instances map[string]*logs.BeeLogger
+var instances = make(map[string]*logs.BeeLogger)
 
 // NewLog 构造日志对象
 func NewLog(tp ...string) *logs.BeeLogger {
@@ -29,7 +28,7 @@ func NewLog(tp ...string) *logs.BeeLogger {
 	instances[logType] = log
 
 	// 读取配置文件
-	conf, err := config.NewConfig("ini", "./conf/log.conf")
+	conf, err := config.NewConfig("ini", GetAppRoot()+"/conf/log.conf")
 	if err != nil {
 		log.SetLogger(logs.AdapterConsole)
 		return log
@@ -91,7 +90,7 @@ func LogInfo(v ...interface{}) {
 		preMsg = fmt.Sprintf("file: %s    line=%d : ", file, line)
 	}
 
-	log.Error(preMsg, v...)
+	log.Info(preMsg, v...)
 }
 
 // GetDefaultLogger 获取默认 logger
@@ -101,9 +100,6 @@ func GetDefaultLogger() *logs.BeeLogger {
 	return log
 }
 
-func init() {
-	instances = make(map[string]*logs.BeeLogger)
+func LogInit() {
 	NewLog()
-
-	defaultLogger = GetDefaultLogger()
 }

utils/message.go

@@ -2,6 +2,7 @@ package utils
 
 import (
 	"github.com/zjxpcyc/websocket"
+	"github.com/zjxpcyc/wechat/wx"
 )
 
 // ClientID 消息对象
@@ -29,22 +30,42 @@ func SendWs(message Message) {
 		Data: message.Data,
 	}
 
-	LogError("发送 Websocket 消息: ", msg)
-
 	websocket.Send(msg)
 }
 
+func SendWechat(message Message) {
+	dt := message.Data.(map[string]interface{})
+	org := dt["orgid"].(string)
+	tplID := dt["tplid"].(string)
+	tplLink := dt["link"].(string)
+	tplData := dt["data"].(map[string]string)
+
+	var data map[string]wx.TplMessageData
+	if tplData != nil {
+		data = make(map[string]wx.TplMessageData)
+		for k, v := range tplData {
+			data[k] = wx.TplMessageData{Value: v}
+		}
+	}
+
+	err := WxClientFor(org).SendTplMessage(message.To.ID, tplID, tplLink, data)
+	if err != nil {
+		LogError("推送微信消息失败: ", err)
+	}
+}
+
 // SendMessage 发送消息
 func SendMessage(message Message, msgType string) {
 	switch msgType {
 	case WsMessage:
 		SendWs(message)
 	case WechatMessage:
+
 	case SMSMessage:
 	default:
 	}
 }
 
-func init() {
+func MessageInit() {
 	go websocket.Run()
 }

utils/rand.go

@@ -3,6 +3,8 @@ package utils
 import (
 	"math/rand"
 	"reflect"
+	"strconv"
+	"strings"
 	"time"
 )
 
@@ -30,6 +32,17 @@ func Shuffle(arr interface{}) interface{} {
 	return res.Interface()
 }
 
+// GetRand 获取随机数
+func GetRand(len int) string {
+	newSeed()
+	var r []string
+	for i := 0; i < len; i++ {
+		m := rnd.Intn(9)
+		r = append(r, strconv.Itoa(m))
+	}
+	return strings.Join(r, "")
+}
+
 // LuckyDraw 抽奖
 func LuckyDraw(pList []map[string]interface{}) interface{} {
 	// 奖池

utils/rand_test.go

@@ -0,0 +1,63 @@
+package utils_test
+
+import (
+	"spaceofcheng/services/utils"
+	"testing"
+)
+
+func TestGetRand(t *testing.T) {
+	res1 := utils.GetRand(6)
+	res2 := utils.GetRand(6)
+
+	if res1 == res2 {
+		t.Fatalf("TestGetRand error, %s, %s", res1, res2)
+	}
+}
+
+func TestLuckyDraw(t *testing.T) {
+	prizeList := []map[string]interface{}{
+		map[string]interface{}{
+			"prize": "A",
+			"prob":  20,
+		},
+		map[string]interface{}{
+			"prize": "B",
+			"prob":  20,
+		},
+		map[string]interface{}{
+			"prize": "C",
+			"prob":  30,
+		},
+		map[string]interface{}{
+			"prize": "D",
+			"prob":  30,
+		},
+	}
+
+	theA := 0
+	theB := 0
+	theC := 0
+	theD := 0
+
+	for i := 0; i < 10000; i++ {
+		res := utils.LuckyDraw(prizeList).(string)
+
+		switch res {
+		case "A":
+			theA += 1
+		case "B":
+			theB += 1
+		case "C":
+			theC += 1
+		case "D":
+			theD += 1
+		default:
+		}
+
+		// bingoList = append(bingoList, utils.LuckyDraw(prizeList))
+	}
+
+	resStr := `A ==> %d  B ==> %d C ==> %d D ==> %d`
+
+	t.Fatalf(resStr, theA, theB, theC, theD)
+}

utils/sms.go

@@ -19,7 +19,7 @@ type SMSEngine struct {
 }
 
 var defaultSMS *SMSEngine
-var mtx *sync.Mutex
+var mtx = new(sync.Mutex)
 
 // ResetSMSEngine 重置引擎
 func ResetSMSEngine(conf config.Configer) {
@@ -71,7 +71,3 @@ func SendSMS(smsType, tel string, messages ...string) {
 
 	}()
 }
-
-func init() {
-	mtx = new(sync.Mutex)
-}

utils/utils.go

@@ -4,6 +4,9 @@ import (
 	"encoding/base64"
 	"math/rand"
 	"net/http"
+	"os"
+	"path/filepath"
+	"runtime"
 	"strconv"
 	"strings"
 	"time"
@@ -156,3 +159,36 @@ func GetFiveSeconds(t time.Time) string {
 
 	return str[:strLen-1] + strconv.Itoa(lastNum)
 }
+
+// 当前运行环境
+var processEnv string
+var appRoot string
+
+// GetAppRoot 获取系统根目录
+func GetAppRoot() string {
+	if appRoot != "" {
+		return appRoot
+	}
+
+	if processEnv == "" {
+		for _, arg := range os.Args {
+			if strings.Index(arg, "-test.run") > -1 {
+				processEnv = "test"
+				break
+			}
+		}
+
+		if processEnv == "" {
+			processEnv = "production"
+		}
+	}
+
+	if processEnv == "test" {
+		_, file, _, _ := runtime.Caller(1)
+		appRoot, _ = filepath.Abs(filepath.Dir(filepath.Join(file, ".."+string(filepath.Separator))))
+	} else {
+		appRoot, _ = filepath.Abs(filepath.Dir(os.Args[0]))
+	}
+
+	return appRoot
+}