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

controllers/card/card.go

 	}
 	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/flashbuy/flashbuy.go

 	c.ResponseJSON(list)
 }
 
+func (c *FlashBuyController) GetCustomerFlashBuyByCustomerId() {
+	customerId := c.GetString(":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")
+	phone := c.GetString("phone")
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
 	list, err := c.dao.GetCustomerFlashBuyById(flashBuyId, phone, page, pageSize)
 	c.ResponseJSON(flashBuy)
 }
 
+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() {
 	flashbuy := model.TaFlashBuy{}
 	if err := c.ParseForm(&flashbuy); err != nil {
 
 func (c *FlashBuyController) UpdateFlashBuy() {
 	flashBuyId := c.GetString(":flashBuyId")
-	flashBuyStatus := c.GetString("flashBuyStatus")
+	flashBuyStatus := c.GetString(":flashBuyStatus")
 	err := c.dao.UpdateFlashBuy(flashBuyId, flashBuyStatus)
 	if err != nil {
 		c.ResponseError(err)
 
 func (c *FlashBuyController) VerifyCustomerFlashBuyList() {
 	qrcode := c.GetString(":qrcode")
-	customerFlashBuy, err := c.dao.VerifyCustomerFlashBuyList(qrcode)
+	cases := c.Context.Get("cases").([]model.SysUserCase)
+	caseids := c.GetCaseIDs(cases)
+	customerFlashBuy, err := c.dao.VerifyCustomerFlashBuyList(qrcode, caseids)
 	if err != nil {
 		c.ResponseError(err)
 	}

controllers/marketing/marketing.go

 	}
 	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)
+}

models/card/card.go

 	_, 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  a.status > ` + strconv.Itoa(models.STATUS_DEL)
+	err := m.db.Sql(sql).Find(&card)
+	return card, err
+
+}

models/customerremark/customerremark.go

 }
 
 func (m *CustomerRemarkDAO) AddRemark(remark model.TaSaleCustomerRemark) (*model.TaSaleCustomerRemark, error) {
-	remark.SaleCustomerRemarkId = utils.GetGUID()
+	remark.SalesCustomerRemarkId = utils.GetGUID()
 	remark.CreateDate = time.Now()
 	remark.Status = models.STATUS_NORMAL
 	_, err := m.db.Insert(remark)

models/flashbuy/flashbuy.go

 	CustomerName             string
 	Phone                    string
 }
+type CustomerFlashResult struct {
+	model.TaCustomerFlashBuy `xorm:"extends"`
+	FlashBuyName             string
+}
+type CustomerFlashDetail struct {
+	model.TaCustomerFlashBuy `xorm:"extends"`
+	CustomerQrcode           string
+}
 
 func (m *FlashbuyDAO) GetFlashBuyList(caseid, flashBuyName, flashBuyStatus string, page, pageSize int) ([]FlashBuy, error) {
 	var flashBuy []FlashBuy
 	return len(customerFlashBuy), err
 }
 
-func (m *FlashbuyDAO) GetCustomerFlashBuyByQr(customerFlashBuyId string) (*CustomerFlashBuy, error) {
+func (m *FlashbuyDAO) GetCustomerFlashBuyByQr(customerFlashBuyId, caseId string) (*CustomerFlashBuy, error) {
 	var customerFlashBuy []CustomerFlashBuy
 	sql := `SELECT
 	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.customer_flash_buy_id ='` + customerFlashBuyId + `'`
+	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 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) + `, ` + 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 
+FROM
+	ta_customer_flash_buy a
+	INNER JOIN ta_customer_course_qrcode b ON a.customer_flash_buy_id = b.customer_course_id
+	WHERE a.customer_flash_buy_id = '` + customerFlashBuyId + `'`
+	err := m.db.Sql(sql).Find(&customerDetail)
+	return &customerDetail, err
+
+}
+
+// Update
 // GetCustomerFlashBuy 获取用户抢购信息
 func (m *FlashbuyDAO) GetCustomerFlashBuy(id, customerid string) ([]model.TaCustomerFlashBuy, error) {
 	var buys []model.TaCustomerFlashBuy

models/luckdrawlist/luckdrawlist.go

 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' )
+	 AND 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

 	_, 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/ta_sale_customer_remark.go

 )
 
 type TaSaleCustomerRemark struct {
-	SalesCustomerRemark string    `xorm:"not null VARCHAR(64)"`
-	SaleCustomerId      string    `xorm:"VARCHAR(64)"`
-	RemarkTitle         string    `xorm:"VARCHAR(256)"`
-	Remark              string    `xorm:"TEXT"`
-	CreateDate          time.Time `xorm:"DATETIME"`
-	Status              int       `xorm:"SMALLINT(6)"`
+	SalesCustomerRemarkId string    `xorm:"not null VARCHAR(64)"`
+	SaleCustomerId        string    `xorm:"VARCHAR(64)"`
+	RemarkTitle           string    `xorm:"VARCHAR(256)"`
+	Remark                string    `xorm:"TEXT"`
+	CreateDate            time.Time `xorm:"DATETIME"`
+	Status                int       `xorm:"SMALLINT(6)"`
 }

routers/common.go

 		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/:caseId", &card.CardController{}, "get:GetSysCardList"),
 		// 赠送记录
 		beego.NSRouter("/record", &card.RecordController{}, "get:GetRecordList"),
 
 		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"),

routers/wechat.go

 	"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"
 		beego.NSRouter("/user/luckdraw/record/:id", &luckdraw.LuckDrawController{}, "get:GetRecordByID"),
 
 		// 抢购
+		beego.NSRouter("/flashbuy/:flashBuyId", &flashbuy.FlashBuyController{}, "get:GetFlashBuyById"),
+		beego.NSRouter("/flashbuy/:customerId", &flashbuy.FlashBuyController{}, "get:GetCustomerFlashBuyByCustomerId"),
+		beego.NSRouter("/flashbuy/:customerFlashBuyId", &flashbuy.FlashBuyController{}, "get:GetCustomerFlashBuyId"),
 		beego.NSRouter("/flashbuy/:id", &flashbuy.FlashBuyController{}, "post:FlashBuy"),
+
+		// 客户备注
+		beego.NSRouter("/customerremark/record/:salesId/:customerId", &customerremark.CustomerRemarkController{}, "get:GetCustomerReceiveRecord"),
+		beego.NSRouter("/customerremark/:salesId/:customerId", &customerremark.CustomerRemarkController{}, "get:GetCustomerRemarkList"),
+		beego.NSRouter("/customerremark/:salesId/:customerInfo", &customerremark.CustomerRemarkController{}, "get:SearchCustomer"),
+		beego.NSRouter("/customerremark", &customerremark.CustomerRemarkController{}, "post:AddRemark"),
 	)
 }

service/card/card.go

 	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) {
 

service/events/constant.go

 
 	// 送券
 	ActGiveCoupon = "giveCoupon"
+	ActGiveCard   = "giveCard"
 )

service/events/events.go

 
 	// 赠送卡券
 	ActGiveCoupon: giveCoupon,
+
+	ActGiveCard: giveCard,
 }
 
 // ListenAllEvent 监听所有事件

service/events/giveCard.go

+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)
+	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.case_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 {
+		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 ActGiveCoupon:
+			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

 			sys_activity_action t
 		JOIN sys_activity s ON t.activity_id = s.activity_id
 		WHERE
-			s.org_id = ?
+		t.active_type = 'giveCoupon'
+		AND	s.org_id = ?
 		AND s.case_id = ?
 		AND s.status = ?
 		AND s.activity_type = ?

service/flashbuy/flashbuy.go

 	}, nil
 }
 
-func (s *FlashBuyServ) VerifyCustomerFlashBuyList(qrcode string) (*flashbuy.CustomerFlashBuy, error) {
+func (s *FlashBuyServ) VerifyCustomerFlashBuyList(qrcode, caseId string) (*flashbuy.CustomerFlashBuy, error) {
 	var err error
 	var customerFlashBuyId string
 	var customerVerify *flashbuy.CustomerFlashBuy
 		utils.LogError("获取核销列表失败: " + err.Error())
 		return nil, errors.New("获取核销列表失败")
 	}
-	customerVerify, err = s.dao.GetCustomerFlashBuyByQr(customerFlashBuyId)
+	customerVerify, err = s.dao.GetCustomerFlashBuyByQr(customerFlashBuyId, caseId)
 	if err != nil {
 		utils.LogError("获取核销列表失败: " + err.Error())
 		return nil, 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)

service/marketing/marketing.go

 	"encoding/json"
 	"errors"
 	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/card"
 	"spaceofcheng/services/models/coupon"
 	"spaceofcheng/services/models/marketing"
 	"spaceofcheng/services/models/model"
 	wdao      *marketing.WorkDAO
 	userdao   *system.UserDAO
 	couponDAO *coupon.CouponDAO
+	cardDAO   *card.CardDAO
 }
 
 // NewMarketingServ 初始化
 		wdao:      marketing.NewWorkDAO(ctx),
 		userdao:   system.NewUserDAO(ctx),
 		couponDAO: coupon.NewCouponDAO(ctx),
+		cardDAO:   card.NewCardDAO(ctx),
 	}
 }
 
 		// 	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
 	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
+}